http://mds.edugain.org into swamid-interfederations-2.0

author: Leif Johansson <leifj@sunet.se> 2014-02-18 15:44:43 +0100
committer: Leif Johansson <leifj@sunet.se> 2014-02-18 15:44:43 +0100
commit: eb32ebf49ae662bd4cce1c1777498d68fd1f54cf (patch)
tree: 4cd37c38dae0184804f8aa296d0aaba790b51491 /swamid-interfederations-2.0
parent: c9e6637865856e53df023972cccb91a13387a27a (diff)
118 files changed, 6626 insertions, 1925 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index f9baa997..cd8f79ad 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,48 @@
 <?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-02-22T14:17:01Z" cacheDuration="PT345600S">
-  <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>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</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 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:geant:edugain:component:be:aaieduhr:aaiedu.hr">
+<md:Extensions>
+<mdrpi:RegistrationInfo registrationAuthority="http://www.aaiedu.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>
+<mdui:UIInfo>
+<mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
+<mdui:DisplayName xml:lang="hr">Središnji AAI@EduHr autentifikacijski servis</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">Središnji autentifikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentifikacije (Single Sign-On Service)</mdui:Description>
+</mdui:UIInfo>
+</md:Extensions>
+<md:KeyDescriptor use="signing">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</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/sso/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/sso/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 - Autentifikacijska i autorizacijska infrastruktura sustava znanosti i 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>team@aaiedu.hr</md:EmailAddress>
+</md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
index 92713c31..33309cde 100644
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
@@ -130,6 +130,7 @@ LxDK1XTR2ZqXgnziFQWnbI54
     <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Campus</GivenName>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
index 0520caad..21b19027 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -93,6 +93,7 @@ GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
     <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>UZH</GivenName>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de.xml b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
new file mode 100644
index 00000000..4ad28ca9
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
+      <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">dfn.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
+        <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
+NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
+BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
+Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
+wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
+IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
+fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
+scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
+h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
+AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
+Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
+gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
+rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
+iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
+MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
+AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
+dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
+oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
+aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
+L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
+rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
+9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
+ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
+o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
+FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.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">dfn.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
+NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
+BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
+Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
+wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
+IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
+fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
+scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
+h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
+AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
+Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
+gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
+rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
+iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
+MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
+AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
+dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
+oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
+aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
+L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
+rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
+9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
+ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
+o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
+FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.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">e15</OrganizationName>
+    <OrganizationName xml:lang="en">e15</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Wolfgang</GivenName>
+    <SurName>Pempe</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>DFN-AAI</GivenName>
+    <SurName>Hotline</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
index c65ea83d..8427576e 100644
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
@@ -108,6 +108,8 @@ M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
     <OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.bfh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.bfh.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>BFH-ITS</GivenName>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
new file mode 100644
index 00000000..c9f5e094
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
+  <Extensions>
+    <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>
+  </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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HES-SO : UAS Western Switzerland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Applied Sciences Western Switzerland</mdui:Description>
+        <mdui:Description xml:lang="fr">Haute École Spécialisée de Suisse occidentale</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAW0lEQVR4nGL4TyFgABN5qxECSOyBNQBEI2OcYvgUYzOUdi4gxjYUm4kxgGgXUAJwGrBl9UI4Rhcj2gBcfGQ2A7Igsg3Y+HgNIOQSkg2gOAyIBRQbAAAAAP//AwDivI9ii0QGKQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAAlCSURBVHic7Fj5T1zXFebPqJzYDhgDTuV0r1RFjaJKTiI7UtNKbdJFXRSSYBsbx3bSuI3TxrFpUlsywanlpo4NMwzGBgzY2CYsw7Dv+zKswzIwLMOwzDDAgWHc892ZNzyGYUl/eXkKSJ/evHfPve/c731nuQQ9fvw4aBv/PxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDtW3Zis9rRms62gzmQtrTGNl/VP2G/7T3AzesZmMoVdn8duYMKxxu6bglU3r13Opb3HkynsWDLtPqyhE5py8oy5fTau5eWgQ/98QGFsFx6TTLuitHRKW0FKb+RrQeAv//WIgg9rKfyYjp5iYs7eqVpDDAg88OE92nM4icKjmei3tPTXlLV23xT4EZhDISCGFQgCz92tCUCgO+iFc/cp9GgSRcCOCfwwvXabwIAESsS4ZSHsWvYQeAQK1NHuKBmB7tW2APLlw4YBc2JxJ+lKu6jIaGmeW1y6hDG33Na9MgfjyK/p1SZbAs/T8jys0WGZyp5dWPxKG1xaWvzE4XBcnbBak2wTE9rZ2dkreLaevdu9fH5ubi5uanLyJuZMT09fX1xc335DAj+6W7dGWdj0C+fu+RS4ikDkSi8pHZbp7OibpfT9d+5QCJP9FKeGEIB//zouj+r7rUW+ObKPlNdsNr1y8RHti7klfAnm9YE9PO/bb6fQ0Rsl5PL7SIGJW4o19fbqKysrh4sMBoe+oICA4qIie2VFhcVsNt/3nzM2Nna7ob6+s7SkxCbZGwoLnbDv7u4uIqKLWyYwmK/vpVTSzBxdcdLiZSctXZrm35ZpZ8LP/p61DoEeNAxYDT/9IIN2vaWhsKM6QRpyKxDGqg2O0tCz72dQq9mWK1diYfuwcf/JFLbTiPwaynNR0PadSOE1tLTj9QT67af55N6EwOXl5fNtbW21IKBQr58vLyuzNou/plaQUZCfTx0dHRVyUfT09BhAFuaAwOamplb+q6/iDyCRWVdXa1pYWLi0JQLDeAPPnLpNB1htL3PVReU98NE9sfF9x28xeTqB3UyGnED7PMX//GIOK1gjxkHCH6/qKbO233oxu5H285phovhoKJrVtOx2nxeb5uuf2A7r4f1Q3MsfP6TSztH6pkFbwV0O599fyafTus0rvt1uvwalgbz6urruufm5OGkM4TgyMpI2MWFNkisP5MG+uqrK7HDYr8ntjcb2GoyBxE4Z8RsSGCFI1HnCzqsejGFjnnGdL9TlBCJXhRzxVGjYvnQhm+zzi/HS+BlWNRQIZf7g3VQatDmS8XxhyfXJS7HZFHo4SayNd732aR6NzszdlCtlZm7hymYE2my2BImQFtbdRorFWGNDQwdsEeqY62+D0IVyYVPGaparcEMCkYe+yznMg1T6HgPXCO94uDeEz9xaaWPev10l1BXhVdErl3JE8fjsyxb695etFPm5gQuQTrRKodFJlN861Il5XN0vvMp9aHCUxrf+Xib5J3/LoJiEMrpX32+RfwgJKArDw8OZcpU5nc74kuLiKZAIUpoaG42wwXN/MkEGQlxSn8vluhCIaKQE2GDNCS5GW8iBWjrNDfLQ5GySedKRhCtgGrenPf9BpghNicDT2nIfga//xyDmrpCQJMIZpKJnDPFWb5EL+V0pFT1OaW5KeY8TuS7Uq3KQ7JnP8/h6iENa3zbcIQ+v6urqAeS0Og5Vl2spVhrr7+vLNTB52HShNxcitzWw2hDCEpH4AMVFxSLcUUDWU6vJZCoQazEwf1MC4fT5jLVVGHiR2xgplAWBSZU+uz9fKxTE+FTMJ5aI48nenJlMT8ek0NMngFsUxgrXlXfP+8KJgZblOS5AouggH0brfGrHsx+9l0poZ2A/Pz9/ubSk1KZnAqEiosVVVRJKgXLKy8qtUkhLVxSNFQKLfASuF+oDAwOPpPkjFkv6lgg8F6BBlhrpPV47qOokh5g0DjWKAsKkIXf+Lj6fTGPT6d0jU1ndI9NZPaMzmb183zs2k44ztGOe4kQL4172vWOEK31KRbczkj/GMydvi3wpKXrXmxqRCiTCh4eHspq4Yo6Ojt5Zb/MIUxQK2CGkQQJIQ7HAGJQJcmpravpQwQOt0dXVVSopEGtticB3dJXrE3hkhcCYL0p9dlCQVEkRpigUVb3jFYGcGrTNBi3x0RBh4+Z+kO+TF13LsXIbhOx3ROXWedsmDcWuExmbAe9BKyMpaZyJwLOamuoBPEPeRNO9Zh6Timou2UC1WyLwbU1ZgH8mBCDwxgqB6BOfO5spxqFC9Is//Esqb7qecpoH+/TGYePnBe30alyuaI3QW2J9JvLCb+LzKPKagfTcD1qmnNopJ11NqzJN7T/paX3CvQRe5/kbEYWqaeEw82980VwjTA1eAif5tCHyZX9frqSuNu79/AvJEDfdRd582uxX1TckMOp68dYU6CPQs3BmbZ81QpwktD4litMEh+LeY55G+sk3Eukgtzjzi0tik8RtzMGPH4jne9n+x2fS6dmzGfwRdCIPSu96/h9ZZPa2PvLjnxxSXkMT3NnZWTY4OJiNIlBXW2uSmuWmpkajFK4oRiBWOnlAbTipoHK3t7fXYC2MoYVBjyl/16oXH4p9QDsiE8Wxa8cbCfSHzwoCKhAKe+LNRNrNdt/i08GR/xbL7Dy2DxsHBw7yeqG8+V1sC+xkPInfXJFRxU9xvpQaaRD4K7QxvOZOznNPRCYIYM5O2PM6v+CWqL5POgKuDxBYUV4+ik3n5+X5gGoNJbW2tDT5nyhwbzQaqxGisJPPk0jFudj/XatucprMfWgrUqt6p9Kqe21lXaO1a/PI46D79QOWlMoex52qXjtsy7vHagJtBOGJ41mioYNu6I10o8AortriLqrsGat2kmvVJsZm5r7IaxnqTvCzTzR0ksFoacVxcqv5Dv8QGB8fT0b4mQUGs6GoGSbBvSH5jqtoUzBPYGgoC6G+Xn/4lRPxNrYJ3Cbw6wTFHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0Dt+B8AAAD//wMAZtOP6cvUNwcAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.12.0/22</mdui:IPHint>
+        <mdui:DomainHint>hes-so.ch</mdui:DomainHint>
+        <mdui:DomainHint>ecal.ch</mdui:DomainHint>
+        <mdui:DomainHint>eia-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>eif.ch</mdui:DomainHint>
+        <mdui:DomainHint>he-arc.ch</mdui:DomainHint>
+        <mdui:DomainHint>heds-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hef-ts.ch</mdui:DomainHint>
+        <mdui:DomainHint>hefr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heg-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heig-vd.ch</mdui:DomainHint>
+        <mdui:DomainHint>hesge.ch</mdui:DomainHint>
+        <mdui:DomainHint>hevs.ch</mdui:DomainHint>
+        <mdui:DomainHint>hsw-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hta-fr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.996710,6.936891</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.793393,7.159078</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.207325,6.099785</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.293093,7.536841</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.379599,7.626590</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.235924,7.351375</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.287826,7.884015</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.361332,7.345858</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.779445,6.658656</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.526928,6.627963</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAMqicqA49UbTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5oZXMtc28uY2gwHhcNMTMxMTI3MTAyODUyWhcNMTYxMTI2
+MTAyODUyWjAeMRwwGgYDVQQDExNhYWktbG9nb24uaGVzLXNvLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJvxk2Aq0rv+KSKYZmat+KfRDoPngFG/
+q7vy+R2o3+em4jUkOI+FrKA87fGmVUTCTj39s6ySilxmeyDppzUG8OLcXYVR62gl
+9EKNAsaDAKLyk6+5EKrD92lgLJqd8mUkFEMsp8Vmp7dfS+3mCrFu1eUC5GdPc+aF
+xf1u+vjP4/ETBU13MNzacsqcXlM0ArPIp7oWrDQnrs151+2kZt5YgASyqtlv6Tz5
+8h153JjL4rkrVSqF3drEFZLN3Qu38zyUrPOYIv9c76lCQ6PUsq875riXZffIcdfP
+dlQtuRuOGnePrs7TP39F5ToJDR5dKdswnhyrgXsTTElkU7UHWlUgKQIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uaGVzLXNvLmNohipodHRwczovL2FhaS1s
+b2dvbi5oZXMtc28uY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLPdE7npAe4X
+MCJJ2tWOvKkGDRwTMA0GCSqGSIb3DQEBBQUAA4IBAQAKmIgNATIcA64ve8grxWDR
+cmBxDOoyl4m7zgaOz5TAhL65R3Ieb1wpvFYfIxtuhR3eSbcTYmD7A6BBp5C2QXZa
+2twKtrGfo/WJMhas9NNhthnZQDYpK/1E54nJPNAKY0eZUnh9QCEdcKmLh9TOl6BF
+eYrPRwFJZSV2pBHhXCaO/aEtTvrL7+DnDljnhb0zfBJ4TCCGnQ/MOALNxt/ZkKz5
+QYG9T2ud56O8FIRDi+rCME6nicN5HF4FVFA3Um8q9WED2vQ6mztFY9y+glOHdRqb
+Hpx/eGHluuFsDHUh9eaXQubano3fjXCVFAhHELlqLWa4uEDyoIQ6RID36NV3V7Ul
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.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-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hes-so.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">hes-so.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFQjCCBCqgAwIBAgIUbQvY+OJqikCxxhTbXiF9bamtIiEwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEzMTEyNzExMTkxNVoXDTE2MTEyNzExMTkxM1ow
+ga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJhMREwDwYDVQQHEwhEZWxlbW9u
+dDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lhbGlzZWUgZGUgU3Vpc3NlIG9j
+Y2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0aXF1
+ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbsalJikrnHoy6SzdmAV13SR0QA
++pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLgSmAx4sqX0WZAYho20gXDY/Rl
+cXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I/oo3kpXzcmsdBx8ZFyz6YIod
+e7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzWCsyyNTpxQWKnEPv4mfjEiyC3
+j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6dEgyuawkNEIqXWaKer+hMoyM
+xAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n//ECAwEAAaOCAZkwggGVMHQG
+CCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+bG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsaWNhLmNydDAeBgNVHREEFzAVghNhYWktbG9nb24uaGVzLXNv
+LmNoMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
+dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+gBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8v
+Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmwwHQYDVR0OBBYEFAX7
+qvdL23DqegSmlCxsX+LERI0AMA0GCSqGSIb3DQEBBQUAA4IBAQBK7qy3M7LVDRUz
+B4szCrhGs4SG5/hh0ZvjSseJaKPwVvqx4p8TdVfuo9VANqkmID1O+lgTBSmNgxai
+xJkCMalwtZDMTKT6SSYFi6khSiYxHDa5NcE7W/SVn5bf5FViuF9P0JeMKnLt+vzF
+wGYTdkdOoOjskmuZmGJhf1VGNtxZ7yI4I4claTWS/4XxAivHx44MmITQrQLLhQZR
+Bb4WgjlWX1X5Do9/nCqSpOJ+QpPb6PRLzsBazR1nwaTVqn7IBTXESQaf3KCAaMUx
+AGxVxS6Wr+7y0NG4xKIrpn+NBa7Tl/KsLcvH8PbmiGa93EFJtbENoO0ICT+2SQQh
+JT6DgiEX
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.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">hes-so.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hes-so.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.hes-so.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Equipe</GivenName>
+    <SurName>AAI HES-SO</SurName>
+    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Equipe</GivenName>
+    <SurName>AAI HES-SO</SurName>
+    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index feefd5c5..5805b05b 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -1,7 +1,7 @@
 <?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="2013-12-05T11:58:08Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-17T08:45:13Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -63,36 +63,35 @@ pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFdDCCBFygAwIBAgIUMup/o7VGOkbi/2w56HVH1VLOxagwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMDEwNTA5MDE1NVoXDTE0MDEwNTA5MDE1NVow
-gcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEd
-MBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xGzAZBgNVBAUTEkNILTAzNS43
-LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNV
-BAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEcMBoGA1UEAxMTYWFpLWxvZ29u
-LnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXJyoKM
-Hw/FxSh3oZS1DLJotPa2RkvOwCdet8Rf3rLcrWn4HVqNVt/LCOfaR0msHqtH76+3
-xRDvgbTa3yvg6T+9oQUDHMKJqakOMuK+zt/6upvswzx7eMJEXO6CXAWZjyubRGuj
-GD/LPc80So16dolhEVtOUkT9+41mFRvRiq0Y5AKrwI2+vDXwcs6pM+AVKwfDVRAO
-M6uUkObMnHR2XHtl0/Zs7BEaUHzcGcNbCSFLZlQexyzEjP7M5h4gkLKgczd4io7o
-0nHGwqA29jj1mpKPJmrFX8aYwOo3BwbDYCX1Iaf59a8MjImu0cwZEzjppIJGQLIK
-7+J2X7UwBANBJ0ECAwEAAaOCAbAwggGsMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEF
-BQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAC
-hixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBR
-BgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8v
-d3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MDgGA1UdEQQxMC+CE2Fh
-aS1sb2dvbi5zd2l0Y2guY2iCGHg1MDkuYWFpLWxvZ29uLnN3aXRjaC5jaDALBgNV
-HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
-MBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6
-Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQU
-K41ahJwmQTKIkscPIrSnMlieSWAwDQYJKoZIhvcNAQEFBQADggEBABlCWm8fWNmO
-vgo8iQw9m6TX9gx0cMQfRs8DNlORAjrD4KWc4kOEFUfZoBOAdfR7WmNSYhmhNIkO
-VItQ/+w0oUB+ddP4QTlHXCnpbksjtp9htx2JvsRIjMKOC0h/BD2IKNcy0lfcXtGD
-Ltb6Xr8E5Qf+zYzQhWMd/3FIUIDEpUT1SbbP4xmBxKKoVENATLJOr6VJlm8Teeyi
-afgDIHNnqggFVE4Cms5x/jnb/eGPtMqYxTyDMiNevSjMHYC3l8da1H6pEay3aDZm
-4U2DLOM5DC2KkfO20jX1eGiv3ArC0aiYLOCVHxyzCu3pFa0M+SHypatfS9/4jDHB
-yLC08u3bwWI=
+MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
+N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
+GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
+BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
+MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
+/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
+dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
+136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
+fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
+DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
+AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
+YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
+KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
+cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
+b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
+Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
+CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
+g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
+Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
+Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
+FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
+Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li.xml b/swamid-interfederations-2.0/aai-logon.uni.li.xml
index f6639829..1f3ace59 100644
--- a/swamid-interfederations-2.0/aai-logon.uni.li.xml
+++ b/swamid-interfederations-2.0/aai-logon.uni.li.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-07-24T06:43:39Z">
+    <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>
   </Extensions>
@@ -36,48 +36,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAP7KVxUdRY7elqq2OvamARNF3EqkMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTEwMjIzMTYxNzEz
-WhcNMTQwMjIzMTYxNzEzWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBtxcfEwbrf1mVnSSYlBEk4c
-uL9qaUWgC2yL865lFUiDV8YfcfGW2IEH9VhxFqCoR0FWcHFLwjRBNbPAKApJKNIo
-nHyAjG1cV9xmbV1IrYbJ5An3grdttLLl9Bd3cJOgrteenEFVqZ88DRZUXRhL2Fra
-MRzVwF5bmIOzQB+dgPna+9bO8f7QBnJnCFAiZvpTsByvrFWD7tLZqxhgmo9LRA3z
-GJMRRL+84PDUEUgqZWzLiuNT1DbjWQCAJmTXpz7SPcuL4xA8ptqkiOF0hdYPfWCz
-Cxc2ex1AuFxZrH1+s++8pKCVoT95IiV3Gs99A8zl7K/9uid/cUh7FUKhuNKFwQID
-AQABo2cwZTBEBgNVHREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2Fh
-aS1sb2dvbi51bmkubGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJlvfp9tflll
-x8GGWV2rgJ3DIZ5gMA0GCSqGSIb3DQEBBQUAA4IBAQBxAuAnIbX9N4FQxENsz+j7
-Elrr0JGtfl1CKJ/NmP0RYfNkQY7bsEzaiwNh0NqSmyt/RQfZRqn5VVzpYjhjWsZB
-rVRtGEGvxZniGeWIomnMNE9ydRCh0p7kdDFJWL2CaQNMQVtH7S5DqFaZ0mQsRrHV
-HriuYIkDiPVh+Na+gP9qtU34UxPL4sgmDSoXVotZ+6ajdpZr8LFl85gow53ICaZ7
-MrDxL9Jo+5sBGE/8m70LgO/2K+ysAbYlcK0iAL+IJTVmF9lSJJZmrZvq5OcAEOPX
-XS/Qn/lUfwKFLRU+MT/NFboEp3w12jAjCFz+Ii5LonkOhIxzwEWXc2WJcC/aqiXJ
-						</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>
-MIIDIDCCAgigAwIBAgIJAOhZUJ08jQ66MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTMwMTIxMDc1NTM0WhcNMTYwMTIxMDc1
-NTM0WjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoWSikfE9lbGDSuDLVYRukm1vnqczuErl+U53ZR3K
-T0HMCutP37H0/oEbQdidEH4snG43NZ8uUqnbpmlYESWW6IaaNWhja9K5RfdutZb7
-u9ag3VYZNaVsONLz9OhVtuTSDaMM4SaBVpjKeAW5/V6q1zlTtHIYT/RuLJaZTRll
-xQZkXWiOQb1gfBuj3BqJ0mYwu4vc6rHrWp2sQ3VxavQ5tIAAdm6Ljexd2FEmRVsv
-bc0nuiHUja6mUJAXps6qAJuvPqmKpzrmipfWl3TE6AYHfRlXME+ipIQXXcIEqR1c
-O7OtECCO2ZD2raFIgEO0/gk1Z9jND/zX1DuJ6Yo97v0nJQIDAQABo2cwZTBEBgNV
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
 HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJkmiO3dfjxi25odK77DbKq3fXE
-MA0GCSqGSIb3DQEBBQUAA4IBAQB502va1acwsrgm9jjB6P8FDVWnDOgwWajKwxc5
-jDTHIXBFrVurD9LR1jv/imeQKB+vK/CIYVkdmel8jdr/JAkEXtBaQehQgmdnvSeF
-kxfP7braAEbzvpvVvqOeQ33K7WGq8Jw2mSsosrIVxCjxv1WMNbMc6feuhqbx3OLF
-+FpqZwXbA7/lQ/qwMk0fP2dpLYOvfeZG92JyyWqnM0iTUAgFf7xB3Ti4PN8VtRTY
-5+Iqh51yf857CF3PaAYT7wdjGjubkar4zI71q9MQTOZuN4nEtaXFWKJL5tKvo3J4
-KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -100,48 +75,23 @@ KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAP7KVxUdRY7elqq2OvamARNF3EqkMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTEwMjIzMTYxNzEz
-WhcNMTQwMjIzMTYxNzEzWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmBtxcfEwbrf1mVnSSYlBEk4c
-uL9qaUWgC2yL865lFUiDV8YfcfGW2IEH9VhxFqCoR0FWcHFLwjRBNbPAKApJKNIo
-nHyAjG1cV9xmbV1IrYbJ5An3grdttLLl9Bd3cJOgrteenEFVqZ88DRZUXRhL2Fra
-MRzVwF5bmIOzQB+dgPna+9bO8f7QBnJnCFAiZvpTsByvrFWD7tLZqxhgmo9LRA3z
-GJMRRL+84PDUEUgqZWzLiuNT1DbjWQCAJmTXpz7SPcuL4xA8ptqkiOF0hdYPfWCz
-Cxc2ex1AuFxZrH1+s++8pKCVoT95IiV3Gs99A8zl7K/9uid/cUh7FUKhuNKFwQID
-AQABo2cwZTBEBgNVHREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2Fh
-aS1sb2dvbi51bmkubGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJlvfp9tflll
-x8GGWV2rgJ3DIZ5gMA0GCSqGSIb3DQEBBQUAA4IBAQBxAuAnIbX9N4FQxENsz+j7
-Elrr0JGtfl1CKJ/NmP0RYfNkQY7bsEzaiwNh0NqSmyt/RQfZRqn5VVzpYjhjWsZB
-rVRtGEGvxZniGeWIomnMNE9ydRCh0p7kdDFJWL2CaQNMQVtH7S5DqFaZ0mQsRrHV
-HriuYIkDiPVh+Na+gP9qtU34UxPL4sgmDSoXVotZ+6ajdpZr8LFl85gow53ICaZ7
-MrDxL9Jo+5sBGE/8m70LgO/2K+ysAbYlcK0iAL+IJTVmF9lSJJZmrZvq5OcAEOPX
-XS/Qn/lUfwKFLRU+MT/NFboEp3w12jAjCFz+Ii5LonkOhIxzwEWXc2WJcC/aqiXJ
-						</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>
-MIIDIDCCAgigAwIBAgIJAOhZUJ08jQ66MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTMwMTIxMDc1NTM0WhcNMTYwMTIxMDc1
-NTM0WjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoWSikfE9lbGDSuDLVYRukm1vnqczuErl+U53ZR3K
-T0HMCutP37H0/oEbQdidEH4snG43NZ8uUqnbpmlYESWW6IaaNWhja9K5RfdutZb7
-u9ag3VYZNaVsONLz9OhVtuTSDaMM4SaBVpjKeAW5/V6q1zlTtHIYT/RuLJaZTRll
-xQZkXWiOQb1gfBuj3BqJ0mYwu4vc6rHrWp2sQ3VxavQ5tIAAdm6Ljexd2FEmRVsv
-bc0nuiHUja6mUJAXps6qAJuvPqmKpzrmipfWl3TE6AYHfRlXME+ipIQXXcIEqR1c
-O7OtECCO2ZD2raFIgEO0/gk1Z9jND/zX1DuJ6Yo97v0nJQIDAQABo2cwZTBEBgNV
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
 HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
-bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJkmiO3dfjxi25odK77DbKq3fXE
-MA0GCSqGSIb3DQEBBQUAA4IBAQB502va1acwsrgm9jjB6P8FDVWnDOgwWajKwxc5
-jDTHIXBFrVurD9LR1jv/imeQKB+vK/CIYVkdmel8jdr/JAkEXtBaQehQgmdnvSeF
-kxfP7braAEbzvpvVvqOeQ33K7WGq8Jw2mSsosrIVxCjxv1WMNbMc6feuhqbx3OLF
-+FpqZwXbA7/lQ/qwMk0fP2dpLYOvfeZG92JyyWqnM0iTUAgFf7xB3Ti4PN8VtRTY
-5+Iqh51yf857CF3PaAYT7wdjGjubkar4zI71q9MQTOZuN4nEtaXFWKJL5tKvo3J4
-KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -157,6 +107,7 @@ KAKEnDkWfKGmYBn6v6NDMXTH1nBVdQnoCDJYipJn+LsStgby
     <OrganizationDisplayName xml:lang="de">Universität Liechtenstein</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Liechtenstein</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.uni.li/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni.li/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>AAI</GivenName>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
new file mode 100644
index 00000000..feb0ec5e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-10T12:27:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Eidgenössische Forschungsanstalt für Wald, Schnee und Landschaft</mdui:Description>
+        <mdui:Description xml:lang="en">Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:Description>
+        <mdui:Keywords xml:lang="en">forest+snow+landscape</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">wald+schnee+landschaft</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAC4gQAAuIEBxcbWvAAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAolJREFUeJxsk91Lk2EUwE8QQQTRTTfeFHgjEWlEdNNfULeyu4z20dyHbtOWOt3XO7fpNPuYZCbejUhNJWLW1JQsE+tiBGldJahD+gJRc+6hOJ3nPEPa2sV53+e8zzm/8/kCIkKxxOYXtir7HuKBgIbg1fDk7XvofJESP3azWrFtgeJIvRRguI5gNCM0tSIE2hE0Eo8PodbO56r+QSwJqOgfUMaNzeQYpnNU6UEJIT0YQQiF89/CWACoHh0X8uJgNIbHunoQ6huVoS+kHLV8JgHlDBY76p6MCQZ83dnRZMrFtUXmXot9R85GZkHAtgBCcxtCixd/CQFQPTzKpJnV1Vkw2ZgOHi/G371P/9zLwtm+fGk3W7A8fh8PRzoRWr3UExtOr6zMwuZuDl6trSW5cUQFb1A1zVDL+ptMJjm0tJwGWz1BPDi3tp4EpxvBZMX2+bdCNUJGbvVT5ym1OifTWfeQ6E2oGx4T27kc23789j0BljqUUj85JWBxfSMBJorm9uDxW3e4F4PpD5/BRiAzGYaofruLS7j8aIjqpyx9tB9X9Ph46VMaJr9QHWYrSkhsYXHr30ZW9D5QEJmZdHK5VSNdNwjq4GCwuZcDTpkg+mdJUTyN4WWq3+FWIDPZ1RgQrplwY3s3vr8HPFujBcspYqnVlrKYySSaUlOieXqmIAg/7M9TAvQ0hToXAy50xjD35zfoBgYwS7PWJxJ4LhzG89Eo31+K9xZuIh/8ND69WqiL3d38Pko/kwRU9txFaHDzN6mf6ej4H8CKlTpfY8SGkRE8okV4XeXWhSYmcvK+LBxRGXZ1lQZIuTr+lGusyhuV0RbK9wm/H0/FVGaHvD48HQzy+S8AAAD//wMAwcp34AlJRawAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/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+hkAAA+FSURBVHic5Fx5UFXXGf9AxIiKgsQF9w1kUwQUERQREBFkk8ciS9j3fRcBFVGzTtqk0ySTaSdpp2nTdPqHxkwTp7E2yUyadFKTdCadOJqamqY1TbOYuMvrd855595zz733gSYXcXqcO4977r1n+d3f932/s1zBbrfDaI7/tzRqXO4YgC4uRrkeeITB/IU54LeyHkJCd8OaiAEIDu2B5f61MHdeOl4PwWPSKMu77TROAcROTpggZsyDJctKYXPCM2Ar+BAq6m5CY4cd2nvt0Nlvh+69dujZx37JedtuOzS026Gs5hpk5f4FomOfQFBzsZzpSona8m87jS8ACTvc3PjZdJi3oAqSUk9CRf0wdPTZYc8BO/QfZEffEJ4PsTz5INfIwe/tHWSgllRdgbjEF2GaZx6WP5HWotZ3W2n8AKh2xB38A9oht/AL2mkOBAeHgEEPDtigNl+574D2PrGc5i47pNvOwLz5xVgfo+KE2wPyzgPo6sr/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjm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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.wsl.ch/index_EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.wsl.ch/index_DE</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.134.200.0/22</mdui:IPHint>
+        <mdui:IPHint>193.134.206.0/24</mdui:IPHint>
+        <mdui:DomainHint>wsl.ch</mdui:DomainHint>
+        <mdui:DomainHint>slf.ch</mdui:DomainHint>
+        <mdui:DomainHint>lfi.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.360644,8.454924</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.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-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.wsl.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">wsl.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.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">wsl.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.wsl.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.wsl.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Helpdesk</GivenName>
+    <SurName>Support Contact</SurName>
+    <EmailAddress>mailto:helpdesk@wsl.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI</GivenName>
+    <SurName>WSL</SurName>
+    <EmailAddress>mailto:aai@wsl.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu.xml
index 578cd7d0..ddb61403 100644
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ b/swamid-interfederations-2.0/aai.sztaki.hu.xml
@@ -5,6 +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">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexxa</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">
diff --git a/swamid-interfederations-2.0/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl.xml
index 1bca3247..4e9a089d 100644
--- a/swamid-interfederations-2.0/adfs.tue.nl.xml
+++ b/swamid-interfederations-2.0/adfs.tue.nl.xml
@@ -1,59 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.tue.nl/adfs/services/trust">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+<md:EntityDescriptor 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="http://adfs.tue.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Description xml:lang="en">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</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>MIIEVDCCAzygAwIBAgIJANm7yUGYaeG1MA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
-BAYTAk5MMRAwDgYDVQQKEwdTVVJGbmV0MREwDwYDVQQLEwhTZXJ2aWNlczEZMBcG
-A1UEAxMQRmVkZXJhdGllIEJlaGVlcjEqMCgGCSqGSIb3DQEJARYbZmVkZXJhdGll
-LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTA4MDYwNTE1MDgyMVoXDTIzMDYwMjE1MDgy
-MVoweTELMAkGA1UEBhMCTkwxEDAOBgNVBAoTB1NVUkZuZXQxETAPBgNVBAsTCFNl
-cnZpY2VzMRkwFwYDVQQDExBGZWRlcmF0aWUgQmVoZWVyMSowKAYJKoZIhvcNAQkB
-FhtmZWRlcmF0aWUtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/x+YuMaHyS3xeogfBB6hWrL4Frp+KzOuu4IixfhMHz3xI
-G5l7p2aNV8UrEXevOwMWCgMNxjfSLdZBgNhR14GBh2cVGCx9f/wUtB86scmkP3Pr
-RLoZWu/EIY6MEbgET3D3tkdGuVejQwwhJTlK2xxWHtEdEL5abjYLveDg6Lb6z9od
-ljFevylBMZO+5LwTjpa3+B+07oMZr2sV1yjsG2BEBwTFz4XZzJAabeK9UO836qhN
-ptktjffoCNen33tNCjzqci4wzgQef3CNA/Ef0tMKGotdldKC6FtHvXixmVY5RKUK
-Iutm8sRwne8XYqrD54BAgXZQ0ZovxFbvGhA77YXxAgMBAAGjgd4wgdswHQYDVR0O
-BBYEFJNoYjIYUrDN/h1+9BZYOTk7jQBNMIGrBgNVHSMEgaMwgaCAFJNoYjIYUrDN
-/h1+9BZYOTk7jQBNoX2kezB5MQswCQYDVQQGEwJOTDEQMA4GA1UEChMHU1VSRm5l
-dDERMA8GA1UECxMIU2VydmljZXMxGTAXBgNVBAMTEEZlZGVyYXRpZSBCZWhlZXIx
-KjAoBgkqhkiG9w0BCQEWG2ZlZGVyYXRpZS1iZWhlZXJAc3VyZm5ldC5ubIIJANm7
-yUGYaeG1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI4IxrYPwwjJ
-D9gO1Vzt8ByeQaRe+V0Mv5Ox9RlcXV33WX8Ny8hqUS4/kjs9v7JOuOw7TRop/4QJ
-IAv/LEXH9B+hQ96zdLGMCcHI2crWF8l0yZ/DtgkpdlcyS7dNbjLtedtmgrOMSQub
-LE02tqoSUR491mQbRuXD49+kJsHXZH8I1YZqOShzPZ7+ksvnBd64txhef8OBlCzE
-elT60nOC3Jm8k3i0HwPcCYfDrh6+MJfC2dvfgktAcyu8rm1Q/ZelxaaXok17wUKg
-D8nDrVCOfTND1RCGcqJ3YVjYDhBrMdK+5NSuC5KOJUpVZbKgTOilnOM7B/Os8HJC
-fxLkDyGV/oQ=
+          <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:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <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://wayf.surfnet.nl/federate/saml20/http%253A%252F%252Fadfs.tue.nl%252Fadfs%252Fservices%252Ftrust"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/http%253A%252F%252Fadfs.tue.nl%252Fadfs%252Fservices%252Ftrust"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Technische Universiteit Eindhoven</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AAI Beheer</SurName>
-    <EmailAddress>aai-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>SURFfederatie Beheer</GivenName>
-    <EmailAddress>federatie-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <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://engine.surfconext.nl/authentication/idp/single-sign-on/094f85b774f9b4334638677b70d5755c"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</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/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
index ef926099..2226fdb1 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-06T16:24:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml
index bf84e8a1..0ce9e58e 100644
--- a/swamid-interfederations-2.0/box-idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/box-idp.nordu.net.xml
@@ -53,6 +53,7 @@
       <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: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="false"/>
       <md: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="false"/>
+      <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" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
new file mode 100644
index 00000000..9da8aa00
--- /dev/null
+++ b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
@@ -0,0 +1,114 @@
+<?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://butare.ifrn.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">ifrn.local</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrn.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrn.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
+EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
+cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
+CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
+MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
+c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
+BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
+MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
+MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
+ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
+jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
+9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
+0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
+sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
+7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
+mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
+qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
+nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
+uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.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">ifrn.local</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
+EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
+cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
+CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
+MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
+c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
+BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
+MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
+MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
+ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
+jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
+9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
+0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
+sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
+7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
+mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
+qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
+nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
+uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+		    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.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">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Carlos Eduardo Egito</SurName>
+    <EmailAddress>eduardo.egito@ifrn.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
new file mode 100644
index 00000000..6b1153f2
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.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:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe-gateway.ifce.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">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifce.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifce.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
+REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
+BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
+BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
+NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
+YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
+9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
+MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
+YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
+tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
+7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
+Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
+mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
+N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
+a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
+ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
+697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
+gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
+3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
+r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
+YyQuuTeZTwk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.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://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.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>
+      
+MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
+REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
+BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
+BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
+NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
+YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
+9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
+MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
+YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
+tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
+7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
+Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
+mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
+N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
+a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
+ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
+697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
+gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
+3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
+r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
+YyQuuTeZTwk=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.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">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifce.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifce.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jessyca</SurName>
+    <EmailAddress>jessyca@ifce.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
index 951c788c..1bf9704a 100644
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
@@ -11,10 +11,10 @@
     <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">Ifes - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">Ifes - Instituto Federal do Espirito Santo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Ifes - Instituto Federal do Espirito Santo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">Ifes - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:DisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
       </mdui:UIInfo>
@@ -99,8 +99,8 @@ q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
   <Organization>
     <OrganizationName xml:lang="en">IFES - Instituto Federal do Espirito Santo</OrganizationName>
     <OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ifes - Instituto Federal do Espirito Santo</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">Ifes - Instituto Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ifes.edu.br/</OrganizationURL>
     <OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</OrganizationURL>
   </Organization>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
index 4ac16b31..90770be7 100644
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
@@ -11,12 +11,12 @@
     <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">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifro.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifro.edu.br</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -96,12 +96,12 @@ ncPF1Y4GUuWaZiPI9hNVkl/z6qfyYIs0yqq4ZE6Dc2TeeA==
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Cieia e Tecnologia de Rond.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifro.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifro.edu.br</OrganizationURL>
+    <OrganizationName xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifro.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Joilson Dantas</SurName>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br.xml b/swamid-interfederations-2.0/cafe.unifran.br.xml
new file mode 100644
index 00000000..0fa667ae
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unifran.br.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:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.unifran.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">unifran.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifran.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifran.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
+WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
+rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
+YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
+Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
+l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
+IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
+QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
+J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
+wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
+yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
+knPC7Pz8oNYCCTafRaBMIA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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://cafe.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.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">unifran.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
+WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
+rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
+YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
+Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
+l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
+IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
+QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
+J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
+wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
+yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
+knPC7Pz8oNYCCTafRaBMIA==
+                
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.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">UNIFRAN - Universidade de Franca</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unifran.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unifran.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Gustavo Carrijo</SurName>
+    <EmailAddress>gustavo@unifran.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
index 1bd9eebb..538bffd8 100644
--- a/swamid-interfederations-2.0/community.ja.net.xml
+++ b/swamid-interfederations-2.0/community.ja.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
-  <!--
-		This is a Janet Community Shibboleth 2 SP for JISC Collections and Janet Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-14T17:37:40Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
index ac7aacde..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org.xml
@@ -1,27 +1,33 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <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:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
index 803bf9de..c8444be0 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
-  <!--
-		This is a Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-09T12:25:06Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
new file mode 100644
index 00000000..240a7c7b
--- /dev/null
+++ b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
@@ -0,0 +1,114 @@
+<?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://dimorus.intranet.ifrj.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">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifrj.ed.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifrj.ed.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
+STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
+UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
+EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
+NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
+VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
+Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
+AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
+DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
+omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
+k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
+2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
+3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
+/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
+gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
+/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.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>
+      
+MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
+STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
+UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
+EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
+NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
+VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
+Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
+AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
+DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
+omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
+k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
+2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
+3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
+/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
+gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
+/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.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">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifrj.ed.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifrj.ed.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marcos Velten</SurName>
+    <EmailAddress>suporte@ifrj.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
index 4e0df2db..dacd6bde 100644
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
@@ -1,15 +1,17 @@
 <?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="2013-12-13T07:30:31Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-20T14:44:42Z">
       <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">\"DOCCOM\", \"University Bern\"</mdui:DisplayName>
-        <mdui:Description xml:lang="en">\"DOCCOM\", \"Institut for medical Education\", \"University Bern\"</mdui:Description>
+        <mdui:DisplayName xml:lang="de">DOCCOM  Deutsch Universität Bern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DOCCOM  German University Bern</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</mdui:Description>
+        <mdui:Description xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -42,11 +44,20 @@ WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">\"DOCCOM\", \"University Bern\"</ServiceName>
-      <ServiceDescription xml:lang="en">\"DOCCOM\", \"Institut for medical Education\", \"University Bern\"</ServiceDescription>
+      <ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</ServiceName>
+      <ServiceName xml:lang="en">DOCCOM  German University Bern</ServiceName>
+      <ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</ServiceDescription>
+      <ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</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"/>
+      <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="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"/>
+      <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"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
@@ -54,6 +65,7 @@ WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
     <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Michel</GivenName>
@@ -61,15 +73,15 @@ WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
     <EmailAddress>mailto:adrian.michel@iml.unibe.ch</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>Salzmann</GivenName>
-    <SurName>Matthias</SurName>
-    <EmailAddress>mailto:matthias.salzmann@iml.unibe</EmailAddress>
-    <TelephoneNumber>+41 31 632 2512</TelephoneNumber>
-  </ContactPerson>
-  <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>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
index c997839e..6563a007 100644
--- a/swamid-interfederations-2.0/doit.swisdom.org.xml
+++ b/swamid-interfederations-2.0/doit.swisdom.org.xml
@@ -97,6 +97,7 @@ MwW3NDMLS+8yP8MK9rI=
     <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Vahid</GivenName>
diff --git a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
new file mode 100644
index 00000000..994d2985
--- /dev/null
+++ b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
@@ -0,0 +1,72 @@
+<?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">
+    <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>
+      <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>
+        <mdui:Description xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</mdui:Description>
+        <mdui:Description xml:lang="it">Corsi di lingua e cultura finlandese, italiana, nederlandese, polacca, portoghese e ungherese. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=291</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=292</mdui:InformationURL>
+        <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>
+      <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: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>
diff --git a/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml b/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml
index 36f30714..7b614703 100644
--- a/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml
+++ b/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml
@@ -23,28 +23,35 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEGTCCAwGgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqzELMAkGA1UEBhMCQlIx
-EjAQBgNVBAgTCVNhbyBQYXVsbzESMBAGA1UEBxMJU2FvIFBhdWxvMSgwJgYDVQQK
-Ex9VU1AgLSBVbml2ZXJzaWRhZGUgZGUgU2FvIFBhdWxvMS4wLAYDVQQLEyVDQ0Ug
-LSBDZW50cm8gZGUgQ29tcHV0YWNhbyBFbGV0cm9uaWNhMRowGAYDVQQDExFlYWEu
-dXNwbmV0LnVzcC5icjAeFw0xMDExMjYxOTU5NDlaFw0xMzExMjUxOTU5NDlaMIGr
-MQswCQYDVQQGEwJCUjESMBAGA1UECBMJU2FvIFBhdWxvMRIwEAYDVQQHEwlTYW8g
-UGF1bG8xKDAmBgNVBAoTH1VTUCAtIFVuaXZlcnNpZGFkZSBkZSBTYW8gUGF1bG8x
-LjAsBgNVBAsTJUNDRSAtIENlbnRybyBkZSBDb21wdXRhY2FvIEVsZXRyb25pY2Ex
-GjAYBgNVBAMTEWVhYS51c3BuZXQudXNwLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAr1lwlGZ34cBAAZfX0yF6X7NxudFroC2CLT7u2PnMgaw9Yez3
-NL8eu21vSLRqx/AYFJTdsobAcLrAsoOQJt0yPy2cR/1wDlczOTn0df34y9OV9Xp9
-WcuJirKtsHp0dM5z90PaHnZAgFNtALQECnTCU8ElLMfF9t1+zTSapxhVRuJcfdyn
-S32j7vKXN1FB8d/ufPs6pTFn9h/y4umXtQp0Zqcbaa1NpPqDLZ+b4bcb6pfmBAl/
-1sVjTBV/VMsyfr+TcM603VWr3gerBHtxb3kBqXqYxN0Qq5yLriZtfqf9P1/4KdR4
-HAzIYZkinwBHdA/JvEHNuN4Q4jqjchLuSkeBZQIDAQABo0YwRDAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEFBQcDAQYJYIZIAYb4QgQBBgor
-BgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAQgUFd/BeAViMQ94p2otxat5cr
-vEM84q8dgOVBr/bdUSGBgTM2Te0dL9KLJ8p+M4pKpb+0m/OTSIsUeeXjUi+ncwx+
-WuF287cAIckmHpSzqTflzBprvHi8lcCFJE24py2ylTCzy12PhoEK3XvWh3p5QR9P
-NO4vPIbBmKsQaYHgBXJeINr4CYomjTUhidPAwj0iP2ZSnRjiLYNQQc+fEvcC1Hck
-aAttl0l6yv+1/NqAjikKhNBxtWoJupmOLnOHT+Lk5K3ZcSTNY5cYeCdlIR/mglJ0
-EpVI+n84611jNC5inAuIf/EiFgaTc9pudkfdR8R28AlpQm1w94YsWxQIvaGQ
+    MIIFUDCCBDigAwIBAgIBADANBgkqhkiG9w0BAQUFADCB0DELMAkGA1UEBhMCQlIx
+EjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYDVQQK
+Ex9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5EVEkg
+LSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYD
+VQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3Au
+YnIwHhcNMTQwMTA4MjA1MTM2WhcNMTkwMTA3MjA1MTM2WjCB0DELMAkGA1UEBhMC
+QlIxEjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYD
+VQQKEx9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5E
+VEkgLSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRow
+GAYDVQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1
+c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWXCUZnfhwEAB
+l9fTIXpfs3G50WugLYItPu7Y+cyBrD1h7Pc0vx67bW9ItGrH8BgUlN2yhsBwusCy
+g5Am3TI/LZxH/XAOVzM5OfR1/fjL05X1en1Zy4mKsq2wenR0znP3Q9oedkCAU20A
+tAQKdMJTwSUsx8X23X7NNJqnGFVG4lx93KdLfaPu8pc3UUHx3+58+zqlMWf2H/Li
+6Ze1CnRmpxtprU2k+oMtn5vhtxvql+YECX/WxWNMFX9UyzJ+v5NwzrTdVaveB6sE
+e3FveQGpepjE3RCrnIuuJm1+p/0/X/gp1HgcDMhhmSKfAEd0D8m8Qc243hDiOqNy
+Eu5KR4FlAgMBAAGjggExMIIBLTAdBgNVHQ4EFgQUUmKcxhJ4qlcGtT4Y/ukIZJFM
+rg0wgf0GA1UdIwSB9TCB8oAUUmKcxhJ4qlcGtT4Y/ukIZJFMrg2hgdakgdMwgdAx
+CzAJBgNVBAYTAkJSMRIwEAYDVQQIEwlTQU8gUEFVTE8xEjAQBgNVBAcTCVNBTyBQ
+QVVMTzEoMCYGA1UEChMfVVNQIC0gVU5JVkVSU0lEQURFIERFIFNBTyBQQVVMTzE3
+MDUGA1UECxMuRFRJIC0gREVQQVJUQU1FTlRPIERFIFRFQ05PTE9HSUEgREEgSU5G
+T1JNQUNBTzEaMBgGA1UEAxMRZWFhLnVzcG5ldC51c3AuYnIxGjAYBgkqhkiG9w0B
+CQEWC3NjbnZAdXNwLmJyggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBABk4OvDS2hRXu+70scuElr76/UIa2wtrlhxQ9aQb3kkzUMIS9kP2v1H7zoCN
+0ly3YVqSlsVw952WHAj/zUCF4MOLzfWuxDrnmHv+pMo/SwNOz65UubW7hrKuuIoH
+p15ciTU1G1DbnDESnfINeaQavRPiMdpM/xaJPMN1Ayb86sZDfp6KztPnnV1kgdyB
+n2b98LO6B6/eCLbLp7Iup8bNFy0blqcHEk/fTqpLgqZ8FT4wf2/jwAzDjzUpnxG6
+JT/8mRnRU7dTGydBR17LIjCaLb8K8rtzELHlpDjd9tvRs62dNHc/sK3ySL8pbS12
+IB3h1QTrpxPIrWqLDwiQU9YAbHo=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +74,35 @@ EpVI+n84611jNC5inAuIf/EiFgaTc9pudkfdR8R28AlpQm1w94YsWxQIvaGQ
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEGTCCAwGgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqzELMAkGA1UEBhMCQlIx
-EjAQBgNVBAgTCVNhbyBQYXVsbzESMBAGA1UEBxMJU2FvIFBhdWxvMSgwJgYDVQQK
-Ex9VU1AgLSBVbml2ZXJzaWRhZGUgZGUgU2FvIFBhdWxvMS4wLAYDVQQLEyVDQ0Ug
-LSBDZW50cm8gZGUgQ29tcHV0YWNhbyBFbGV0cm9uaWNhMRowGAYDVQQDExFlYWEu
-dXNwbmV0LnVzcC5icjAeFw0xMDExMjYxOTU5NDlaFw0xMzExMjUxOTU5NDlaMIGr
-MQswCQYDVQQGEwJCUjESMBAGA1UECBMJU2FvIFBhdWxvMRIwEAYDVQQHEwlTYW8g
-UGF1bG8xKDAmBgNVBAoTH1VTUCAtIFVuaXZlcnNpZGFkZSBkZSBTYW8gUGF1bG8x
-LjAsBgNVBAsTJUNDRSAtIENlbnRybyBkZSBDb21wdXRhY2FvIEVsZXRyb25pY2Ex
-GjAYBgNVBAMTEWVhYS51c3BuZXQudXNwLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAr1lwlGZ34cBAAZfX0yF6X7NxudFroC2CLT7u2PnMgaw9Yez3
-NL8eu21vSLRqx/AYFJTdsobAcLrAsoOQJt0yPy2cR/1wDlczOTn0df34y9OV9Xp9
-WcuJirKtsHp0dM5z90PaHnZAgFNtALQECnTCU8ElLMfF9t1+zTSapxhVRuJcfdyn
-S32j7vKXN1FB8d/ufPs6pTFn9h/y4umXtQp0Zqcbaa1NpPqDLZ+b4bcb6pfmBAl/
-1sVjTBV/VMsyfr+TcM603VWr3gerBHtxb3kBqXqYxN0Qq5yLriZtfqf9P1/4KdR4
-HAzIYZkinwBHdA/JvEHNuN4Q4jqjchLuSkeBZQIDAQABo0YwRDAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEFBQcDAQYJYIZIAYb4QgQBBgor
-BgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAQgUFd/BeAViMQ94p2otxat5cr
-vEM84q8dgOVBr/bdUSGBgTM2Te0dL9KLJ8p+M4pKpb+0m/OTSIsUeeXjUi+ncwx+
-WuF287cAIckmHpSzqTflzBprvHi8lcCFJE24py2ylTCzy12PhoEK3XvWh3p5QR9P
-NO4vPIbBmKsQaYHgBXJeINr4CYomjTUhidPAwj0iP2ZSnRjiLYNQQc+fEvcC1Hck
-aAttl0l6yv+1/NqAjikKhNBxtWoJupmOLnOHT+Lk5K3ZcSTNY5cYeCdlIR/mglJ0
-EpVI+n84611jNC5inAuIf/EiFgaTc9pudkfdR8R28AlpQm1w94YsWxQIvaGQ
+MIIFUDCCBDigAwIBAgIBADANBgkqhkiG9w0BAQUFADCB0DELMAkGA1UEBhMCQlIx
+EjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYDVQQK
+Ex9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5EVEkg
+LSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYD
+VQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3Au
+YnIwHhcNMTQwMTA4MjA1MTM2WhcNMTkwMTA3MjA1MTM2WjCB0DELMAkGA1UEBhMC
+QlIxEjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYD
+VQQKEx9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5E
+VEkgLSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRow
+GAYDVQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1
+c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWXCUZnfhwEAB
+l9fTIXpfs3G50WugLYItPu7Y+cyBrD1h7Pc0vx67bW9ItGrH8BgUlN2yhsBwusCy
+g5Am3TI/LZxH/XAOVzM5OfR1/fjL05X1en1Zy4mKsq2wenR0znP3Q9oedkCAU20A
+tAQKdMJTwSUsx8X23X7NNJqnGFVG4lx93KdLfaPu8pc3UUHx3+58+zqlMWf2H/Li
+6Ze1CnRmpxtprU2k+oMtn5vhtxvql+YECX/WxWNMFX9UyzJ+v5NwzrTdVaveB6sE
+e3FveQGpepjE3RCrnIuuJm1+p/0/X/gp1HgcDMhhmSKfAEd0D8m8Qc243hDiOqNy
+Eu5KR4FlAgMBAAGjggExMIIBLTAdBgNVHQ4EFgQUUmKcxhJ4qlcGtT4Y/ukIZJFM
+rg0wgf0GA1UdIwSB9TCB8oAUUmKcxhJ4qlcGtT4Y/ukIZJFMrg2hgdakgdMwgdAx
+CzAJBgNVBAYTAkJSMRIwEAYDVQQIEwlTQU8gUEFVTE8xEjAQBgNVBAcTCVNBTyBQ
+QVVMTzEoMCYGA1UEChMfVVNQIC0gVU5JVkVSU0lEQURFIERFIFNBTyBQQVVMTzE3
+MDUGA1UECxMuRFRJIC0gREVQQVJUQU1FTlRPIERFIFRFQ05PTE9HSUEgREEgSU5G
+T1JNQUNBTzEaMBgGA1UEAxMRZWFhLnVzcG5ldC51c3AuYnIxGjAYBgkqhkiG9w0B
+CQEWC3NjbnZAdXNwLmJyggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBABk4OvDS2hRXu+70scuElr76/UIa2wtrlhxQ9aQb3kkzUMIS9kP2v1H7zoCN
+0ly3YVqSlsVw952WHAj/zUCF4MOLzfWuxDrnmHv+pMo/SwNOz65UubW7hrKuuIoH
+p15ciTU1G1DbnDESnfINeaQavRPiMdpM/xaJPMN1Ayb86sZDfp6KztPnnV1kgdyB
+n2b98LO6B6/eCLbLp7Iup8bNFy0blqcHEk/fTqpLgqZ8FT4wf2/jwAzDjzUpnxG6
+JT/8mRnRU7dTGydBR17LIjCaLb8K8rtzELHlpDjd9tvRs62dNHc/sK3ySL8pbS12
+IB3h1QTrpxPIrWqLDwiQU9YAbHo=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
index 5bffe413..56d2736a 100644
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
+++ b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
@@ -1,8 +1,5 @@
 <?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>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br.xml b/swamid-interfederations-2.0/febe.ufpe.br.xml
index d826d005..abda1089 100644
--- a/swamid-interfederations-2.0/febe.ufpe.br.xml
+++ b/swamid-interfederations-2.0/febe.ufpe.br.xml
@@ -23,27 +23,26 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID2jCCAsICAQAwDQYJKoZIhvcNAQEFBQAwgbIxMjAwBgNVBAoTKVVGUEUgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJuYW1idWNvMTIwMAYDVQQLEylVRlBF
-IC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybmFtYnVjbzEPMA0GA1UEBxMG
-UmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEVMBMGA1UE
-AxMMZmViZS51ZnBlLmJyMB4XDTEwMTIxNDE4NTQzNVoXDTEzMTIxMzE4NTQzNVow
-gbIxMjAwBgNVBAoTKVVGUEUgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJu
-YW1idWNvMTIwMAYDVQQLEylVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-UGVybmFtYnVjbzEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFY
-yi5SUixTxYFsp/DCRTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1
-VH3pK08mIrRN2B8SKqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHy
-nvggRtkXDE7ORpEYKG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJ
-JkRYo4E5d1J03PKgrWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzY
-LZCRc1f1MnEgB7M33/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAuCHCOkWNx6sFbINyPVRz5N4K267P/4yzLw4bvDnJLHgTG
-lH02xH9LTb54e1gM+3zqxXwLlb2A3RlEWia4vOkbZ88wumLpR7hTfLXPZjxJtZQZ
-69Iofi3N8qwerYY4ml/45u5x2I+w/NISngWeh2CKYbgwyuAwZuNzMCIsy4ZyTn2k
-OgOMB8lobSFgzUqA6ax+ZjZwhkE7w+2qCPt6K+gEpG4PTcv9ydwdgUOXWa+K9blz
-eOoi5DVVcThToEXUtrjHYnYzB0r2ji8ghF+NfFVMVYks6CeYYLzzIjefaE3p7Eok
-AZEltrRhWnXsrdoD0ZidRkOFh64ryggXE0tXyA6L
+    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,27 +65,26 @@ AZEltrRhWnXsrdoD0ZidRkOFh64ryggXE0tXyA6L
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID2jCCAsICAQAwDQYJKoZIhvcNAQEFBQAwgbIxMjAwBgNVBAoTKVVGUEUgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJuYW1idWNvMTIwMAYDVQQLEylVRlBF
-IC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybmFtYnVjbzEPMA0GA1UEBxMG
-UmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEVMBMGA1UE
-AxMMZmViZS51ZnBlLmJyMB4XDTEwMTIxNDE4NTQzNVoXDTEzMTIxMzE4NTQzNVow
-gbIxMjAwBgNVBAoTKVVGUEUgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJu
-YW1idWNvMTIwMAYDVQQLEylVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-UGVybmFtYnVjbzEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNv
-MQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFY
-yi5SUixTxYFsp/DCRTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1
-VH3pK08mIrRN2B8SKqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHy
-nvggRtkXDE7ORpEYKG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJ
-JkRYo4E5d1J03PKgrWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzY
-LZCRc1f1MnEgB7M33/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAuCHCOkWNx6sFbINyPVRz5N4K267P/4yzLw4bvDnJLHgTG
-lH02xH9LTb54e1gM+3zqxXwLlb2A3RlEWia4vOkbZ88wumLpR7hTfLXPZjxJtZQZ
-69Iofi3N8qwerYY4ml/45u5x2I+w/NISngWeh2CKYbgwyuAwZuNzMCIsy4ZyTn2k
-OgOMB8lobSFgzUqA6ax+ZjZwhkE7w+2qCPt6K+gEpG4PTcv9ydwdgUOXWa+K9blz
-eOoi5DVVcThToEXUtrjHYnYzB0r2ji8ghF+NfFVMVYks6CeYYLzzIjefaE3p7Eok
-AZEltrRhWnXsrdoD0ZidRkOFh64ryggXE0tXyA6L
+MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 89dde5db..1a8154cc 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,9 +1,19 @@
 <?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://filesender.funet.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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
@@ -13,12 +23,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
@@ -49,47 +55,47 @@ NuSoiRuRqUwvjh1crrpK3aEPzrhwALKEQo0tIKOpSHjVUwvGXWtoljY7JJJt94y1
 o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Funet FileSender</md:ServiceName>
-      <md:ServiceName xml:lang="en">Funet FileSender</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Funet FileSender</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</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: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>Harri</md:GivenName>
-    <md:SurName>Kuusisto</md:SurName>
-    <md:EmailAddress>mailto:funyht@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomi</md:GivenName>
-    <md:SurName>Salmi</md:SurName>
-    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tomi</md:GivenName>
-    <md:SurName>Salmi</md:SurName>
-    <md:EmailAddress>mailto:noc@funet.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </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://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.funet.fi/simplesaml/module.php/saml/sp/saml2-acs.php/SP" index="2" isDefault="false"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Funet FileSender</ServiceName>
+      <ServiceName xml:lang="en">Funet FileSender</ServiceName>
+      <ServiceName xml:lang="sv">Funet FileSender</ServiceName>
+      <ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</ServiceDescription>
+      <ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</ServiceDescription>
+      <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"/>
+      <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="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="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Harri</GivenName>
+    <SurName>Kuusisto</SurName>
+    <EmailAddress>mailto:funyht@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tomi</GivenName>
+    <SurName>Salmi</SurName>
+    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Tomi</GivenName>
+    <SurName>Salmi</SurName>
+    <EmailAddress>mailto:noc@funet.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index 91edbfcc..1cf3fb1c 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,15 +1,37 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:Extensions>
+    <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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor 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">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
+        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
+        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="58" width="187">https://foodl.org/res/foodle_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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>
@@ -22,20 +44,26 @@
       <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: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="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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" 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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <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:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</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.xml
new file mode 100644
index 00000000..d115131c
--- /dev/null
+++ b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ghgtool.grnet.gr/shibboleth">
+  <Extensions 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>
+  <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GHG report tool</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ghgtool.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ghgtool.grnet.gr/about/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.png</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="http://ghgtool.grnet.gr/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="http://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFwTCCA6mgAwIBAgIJAMzPE0+nt+YbMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
+                            BAYTAkdSMQ4wDAYDVQQIEwVQQVRSQTEMMAoGA1UEBxMDUklPMQ4wDAYDVQQKEwVH
+                            Uk5FVDEMMAoGA1UECxMDUlU2MB4XDTEzMTExMjAxMjI1NloXDTE0MTExMjAxMjI1
+                            NlowSTELMAkGA1UEBhMCR1IxDjAMBgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8x
+                            DjAMBgNVBAoTBUdSTkVUMQwwCgYDVQQLEwNSVTYwggIiMA0GCSqGSIb3DQEBAQUA
+                            A4ICDwAwggIKAoICAQDCNiDRCIEqgOS4RtYPP04QBw632zSJ9tklRo5VcnzrneYH
+                            r2APRVeUQO4uPUMeJEs3a/MQkh8C/zWctIrTWyJh/RVO77uXhxYFQyptNx3hhg3Y
+                            GABTxJ5Jv6Jkzznhr2+Rq/ayEKLuIxQDt5aG3pcBEX9M59LLjIJa1gtT06wYq2Bn
+                            eHBJshDCeEQvC4N7bZLbcCo60Yge7cPfam67Gyrrvr2e7VW/VJJ0hFSvjbh3bGco
+                            TRYRurdtIyjxKRoUvDMFujcbnP1KaHQS5vZlneWcVanu0FWW3ieOYiDPZcZ5yKUq
+                            MGGY3OzWpEOzrOh2Bmgx7zWmcoye+5Rj+1+NvOmkkNqTJs0x+Y0mKY63xfzpHbzj
+                            1iyzSkfoW0sd4V+3ymd951gUkgigJs7WPpkUz5PMt8QmIUH9e+nxBiU2UPA3TTXw
+                            DWs3i40tiGBSkAKLLEz/7wCOgiA733JgkKAbi6TLUFr0VNAQlRZwlyjzD3j8ixis
+                            qBKjnKJ+3uAJ7T3pRNnZCw9s0Qg9Hj6st3u7DmQ9McH3QFgvmS9pWAVKqW95PPtO
+                            MvIASOCdDDnry8yrMG/sUYmbAc8+Nr2+GZR5e14ZmMaN2ImM7xDdLEUdE9jFqInv
+                            fErEbIu+00EVYYijNmIamywaCrSr09LlXXC6/1vPlZdiGhBcFE/i5KbUeUlwMwID
+                            AQABo4GrMIGoMB0GA1UdDgQWBBTiec00rlpZRRGu2TrFpqW1sjMCRzB5BgNVHSME
+                            cjBwgBTiec00rlpZRRGu2TrFpqW1sjMCR6FNpEswSTELMAkGA1UEBhMCR1IxDjAM
+                            BgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8xDjAMBgNVBAoTBUdSTkVUMQwwCgYD
+                            VQQLEwNSVTaCCQDMzxNPp7fmGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+                            A4ICAQA7Ii3a/ZLBsRavzMBp54dnbC66oSiIPylHo2Xkc413uHVrMJEnroT/o1jk
+                            RKq90Mvqr2sGfTpYjz6fGX3A+LHUOW2XYnqQCTILMcJgvSnqXW3Fxcd00ogSdZWx
+                            0KS5VVNCZ5mPEgsQwr+BtOKdB2sb8PGhWYKnVSKYLCrt4FjX7gJBYLpqUGWxMyoq
+                            fWg2ovutdRW/izFIGuEEW1031+HZ+9f66AMexswnAIUhEeF6Ew14saA2f23Rvoyl
+                            4rFqQ0wbXsnOy+PeS9bnF6QLCEXMVlEkJg+MNPkESPY6Lns98ExIP0gh9rcOSR97
+                            4KHhgFsJMWG6PfcQ328wjeMtQF9ZqThhtb+//5eODBtIZZvZjZfcICh6lEHiwh2a
+                            8pX39iau26q7Oy5WtMXf8lLFS/ECfmc1WLfZZlh9C/cjHRkrFLwqyCiwpQ/QfGFZ
+                            HgfCEKwvZ7gS7UuiT7Aa6gGy8IXwZFC4gwtcQ5n7Fo35K6WBeA9tJ+n2GWwDF/5M
+                            tkmYhp5t+sCXM4ygUfHnvwLvxkLN2yUzFZCpPsoaQwbWOhvmAsvaz4c9ZMlySGia
+                            hr0y8arTsb1cPFQvcM/1xvjWw8nlx3OaoHV4hV3K+B2e+heYkP11DLoY5ZiG2Dh/
+                            eMqY26cZtNFIW4tgT7/uLpwzbeTrVDCG/PuoSyYicbEMLQ+hDA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+    <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:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="0" isDefault="true">
+      <ServiceName xml:lang="en">GHG report tool</ServiceName>
+      <ServiceDescription xml:lang="en">GHG online reporting tool</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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="shacHomeOrganization" 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="shacHomeOrganization" Name="urn:mace:terena.org:schac:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Vasiliki Giannikopoulou</GivenName>
+    <EmailAddress>vasilg@admin.grnet.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Constantinos Vassilakis</GivenName>
+    <EmailAddress>cvassilakis@admin.grnet.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
index e3f54037..123d41e3 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iam.cf.ac.uk/sp/shibboleth">
-  <!--
-		This is a IAM@Cardiff Shibboleth SP for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T13:42:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idemfero.units.it.xml b/swamid-interfederations-2.0/idemfero.units.it.xml
index 7c23e9ec..e471f5b5 100644
--- a/swamid-interfederations-2.0/idemfero.units.it.xml
+++ b/swamid-interfederations-2.0/idemfero.units.it.xml
@@ -8,6 +8,7 @@
   <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">
         <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
@@ -36,6 +37,7 @@
   <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>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
new file mode 100644
index 00000000..dca95568
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
@@ -0,0 +1,113 @@
+<?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-cafe.ifrr.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">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifrr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifrr.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
+Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
+AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
+MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
+IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
+LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
+B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
+zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
+zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
+uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
+B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
+TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
+AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
+TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
+QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
+GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
+zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
+ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.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-cafe.ifrr.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-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.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>
+      
+MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
+Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
+AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
+MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
+IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
+LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
+B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
+zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
+zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
+uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
+B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
+TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
+AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
+TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
+QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
+GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
+zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
+ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.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">IFRR - Instituto Federal de Roraima</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifrr.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifrr.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Francisco Cavalcante Filho</SurName>
+    <EmailAddress>francisco.filho@ifrr.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
index 59b543d0..6139f822 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dev.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth 2 test IdP for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-20T15:18:56.122159Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
index 546b3910..348badbd 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP (clustered with Terracotta 3.0) for Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-25T18:02:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
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.xml
new file mode 100644
index 00000000..0aaf6de9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.ucs.ed.ac.uk/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
+						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
+						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk: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-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/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">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
+						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
+						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk: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 Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
index 67644a75..feb13fb9 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
@@ -16,8 +16,7 @@
         <mdui:Description xml:lang="sl">Akademska in raziskovalna mreža Slovenije</mdui:Description>
         <mdui:Keywords xml:lang="en">arnes academic arnesaai aai</mdui:Keywords>
         <mdui:Keywords xml:lang="sl">arnes akademska arnesaai aai</mdui:Keywords>
-        <mdui:Logo height="67" width="64">data:image/png;base64,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
-		</mdui:Logo>
+        <mdui:Logo height="67" width="64">data:image/png;base64,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</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.arnes.si/en</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sl">http://www.arnes.si</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
diff --git a/swamid-interfederations-2.0/idp.aco.net.xml b/swamid-interfederations-2.0/idp.aco.net.xml
index dc93c26a..6d8cf509 100644
--- a/swamid-interfederations-2.0/idp.aco.net.xml
+++ b/swamid-interfederations-2.0/idp.aco.net.xml
@@ -11,8 +11,8 @@
         <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
         <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
-        <mdui:Logo height="60" width="137">https://wayf.aco.net/images/aconet_small.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.aco.net/fileadmin/site/aconet/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="137">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
         <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
       </mdui:UIInfo>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index 424c4360..de5b7cf6 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -130,8 +130,8 @@
     <TelephoneNumber>+30-2109569181</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="support">
-    <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
-    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <Company>GRNET headquarters</Company>
+    <EmailAddress>support@admin.grnet.gr</EmailAddress>
+    <TelephoneNumber>+30-2107474275</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
index 7f61c336..6863a333 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.company.ja.net/idp/shibboleth">
-  <!--
-		This is a Janet Shibboleth IdP for JISC Collections and Janet Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-30T16:21:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be.xml b/swamid-interfederations-2.0/idp.condorcet.be.xml
new file mode 100644
index 00000000..e2938d0e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.condorcet.be.xml
@@ -0,0 +1,103 @@
+<?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.condorcet.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">condorcet.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
+BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
+IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
+EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
+Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
+KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
+gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
+ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
+QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
+MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
+Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
+1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
+0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
+QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
+uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
+NJp/Skt7sw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.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.condorcet.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.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">condorcet.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
+BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
+IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
+EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
+Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
+KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
+gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
+ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
+QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
+MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
+Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
+1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
+0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
+QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
+uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
+NJp/Skt7sw==
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.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">Haute Ecole Provinciale de Hainaut - Condorcet</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">HEPH-Condorcet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.condorcet.be</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>webmaster@condorcet.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index e76de6b3..e855d232 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,10 +1,15 @@
 <?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>
+<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" entityID="https://idp.csc.fi/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
@@ -15,15 +20,11 @@
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
       </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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQUB8GAq0UqrSAF/D1Yq57fDANBgkqhkiG9w0BAQUFADA2
@@ -53,27 +54,27 @@ H3YX4fNdibt18KEE5w7rXmwJTJwwDxw3UHR3rAcu+PxREwAl22zTk2oSc7DLUMib
 Iw==</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>
+    </KeyDescriptor>
+    <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://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Lauros</SurName>
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net.xml
new file mode 100644
index 00000000..505407b5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dante.net.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dante.net/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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">dante.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">DANTE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DANTE plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/16x16-DANTE.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/80x60-DANTE.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>dante.net</mdui:DomainHint>
+        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
+						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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.dante.net/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/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">dante.net</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
+						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net: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">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">
+    <GivenName>DANTE Support</GivenName>
+    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE Support</GivenName>
+    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
index 2db8176c..6389209d 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -61,9 +61,9 @@ RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.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>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
new file mode 100644
index 00000000..e9c6885a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ed.ac.uk/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</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">ed.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
+        <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
+						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk: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.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/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">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
+						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk: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 Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Edinburgh</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:IS.Helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 1dd0a5c1..928ccf15 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,314 +1,323 @@
 <?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.feide.no">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
-      <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">drammen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
-      <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">hemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
-      <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>
-      <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hsh.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">karmoyskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lardal.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">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">lunner.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
-      <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">mf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
-      <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">nord-aurdal.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>
-      <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
-      <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">saltdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">samfunnsforskning.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">sauda.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">sfj.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">voss.kommune.no</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">norway</saml:AttributeValue>
-      </saml:Attribute>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
+        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
+        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
+      <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">bibsys.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
+      <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">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
+      <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">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
+      <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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <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">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">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <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">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">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">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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
+      <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">mf.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.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">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
+      <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">nord-aurdal.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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
+      <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">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">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">sauda.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">sfj.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">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <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">tokke.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">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCMHNhxUI2H1TANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0wODA5MDUxMTU0MzNaFw0xODA3MTUxMTU0MzNaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4fTsmIsKVGtniXddnerSeiLeAZAlAOL8v+ebzVzYcpTJzMHrplD+lF2tXxRgs7IGEw3t2zRCtxnGbiGkXPW+oCs4T989z+Sq8nh7Lff/XlyK+jQ7BtfC8RUYQ+eNEQy0Fif+81JyPbiwZovbiL4WrK1GOG81/2CF7rvwyXJkDD1YXJ5W18/c06YLfYJjuzZgEoCVRq6ecgQyPKg1xwIpW2GpkKOBXA7oKWtev+xcmSiLZwZE96mSHjty0L+wW6NUuf2/8VSCc4IED0EbzqFUoeHuGXqPak+tu9+VpP6vmmyp4gSCxsmWtoKm7UC8P1QeCyZxwQaoGlIp78wsE5ao5wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACUWuuirUSwDWksdkwKuqsNttnNmivwUMLtKDjHbMcwVK/b4qWjrAjfmJXxamUSYlnGjeoiqSQQuc3/qHCPAZUnN8VqXcZUCBXWjMO7Y/AnnsFKHpkYm51jWckjudeyfUr4UnH7te0OuUrGRIVrRRg3DqLdgrcbkJ98JyT97hnaDMke4qNVwrQFF+yvxYs1aYkILySBB/KPGSTh5sxJovcyWd7GY4ad5nH5oEjXF1yZzndmUuHGlTTzk6SGzmUJgqKyba+KJ/jauy6qNC1gPqfnbntWKDkE9a9ow8tlsi3jHI9AZu9U6LnOvTJ8MjhyXOEByCaDnTpK8JiZr6JvCaV</ds:X509Certificate>
         </ds:X509Data>
@@ -318,10 +327,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
     <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
   </md:Organization>
@@ -329,8 +338,4 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
new file mode 100644
index 00000000..138a4ae5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-rosenheim.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
+      <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">fh-rosenheim.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-rosenheim.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.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">fh-rosenheim.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.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">e360</OrganizationName>
+    <OrganizationName xml:lang="en">e360</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Robert</GivenName>
+    <SurName>Meier</SurName>
+    <EmailAddress>mailto:robert.meier@fh-rosenheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Robert</GivenName>
+    <SurName>Meier</SurName>
+    <EmailAddress>mailto:idm-support@fh-rosenheim.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
index 8f200ec0..5d62e2c8 100644
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
@@ -71,6 +71,7 @@ UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/SOAP/ECP"/>
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor 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/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
new file mode 100644
index 00000000..29c9efea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hslu.ch.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-14T15:12:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
+        <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</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+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv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</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
+        <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
+        <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
+        <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
+        <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
+        <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
+        <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
+        <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
+        <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
+        <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
+        <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
+        <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
+        <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
+        <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
+        <mdui:DomainHint>hslu.ch</mdui:DomainHint>
+        <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
+MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
+hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
+S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
+5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
+bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
+fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
+9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
+0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
+vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
+wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
+p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
+OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
+						</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>
+MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
+gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
+bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
+BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
+y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
+0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
+sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
+GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
+ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
+AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
+L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
+c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
+ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
+BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
+aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
+DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
+o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
+J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
+R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
+A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
+CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
+moKY92W4xbV9VFcSbg==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.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://idp.hslu.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.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">hslu.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
+MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
+hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
+S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
+5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
+bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
+fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
+9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
+0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
+vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
+wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
+p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
+OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
+						</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>
+MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
+gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
+bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
+BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
+y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
+0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
+sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
+GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
+ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
+AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
+L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
+c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
+ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
+BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
+aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
+DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
+o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
+J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
+R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
+A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
+CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
+moKY92W4xbV9VFcSbg==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.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">hslu.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.hslu.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hslu.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Hochschule Luzern - IT Services</GivenName>
+    <SurName>(Hotline)</SurName>
+    <EmailAddress>mailto:informatikhotline@hslu.ch</EmailAddress>
+    <TelephoneNumber>+41 41 228 21 21</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Hochschule Luzern - IT Services</GivenName>
+    <SurName>(AAI Technician)</SurName>
+    <EmailAddress>mailto:aai@hslu.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
index 8e44ef54..ea2e29e0 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,16 +1,30 @@
 <?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://idp.ids-mannheim.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://idp.ids-mannheim.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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-22T10:22:36Z">
+      <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">ids-mannheim.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider des Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider of the Institut für Deutsche Sprache</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
+        <mdui:Logo height="63" width="318">https://idp.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
 RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
 AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
@@ -37,37 +51,86 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
 HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
 xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
 VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-99YJ9IIzYQ==</ds:X509Certificate>
+99YJ9IIzYQ==
+</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://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
-      <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. 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>Oliver</md:GivenName>
-    <md:SurName>Schonefeld</md:SurName>
-    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.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://idp.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.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">ids-mannheim.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTExMTkxNDI4MTVaFw0xNDEx
+MTgxNDI4MTVaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRwwGgYDVQQDExNpZHAuaWRzLW1hbm5oZWltLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt7L/7N+17/v7lajOiMdvThxk
+NoiCwy2RDzaDi7IEvJtXmT1CkKXVg84uxCneoixdPwO9EZAyphOGfXyvIWiWOEkB
+8135pYTbKNYPuG0+fIYXPvHE1+oFMca3K21GgssvoOZYJfi/wrORLx77iQXRgGYF
+mRllzaspZriQNbIvCwVsKsoL8zt9TeVa0Ltv6A7dRg/36u8XppG4glE4xuuXQgNI
+mj0qpJ9pV76bgzPKUNm2/aXDiyqoI4qvp2h4vM2sFv2MAguPkHI7PPcVXn1L2q3h
+WpylL+gjjNfZm1TdDww+r1HFdeQDORmjSh+Cd4bbdEeA2bWH3NHjSR6xWwCj/wID
+AQABo4IBvDCCAbgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSg5wzZdnXH5hJRlkFfkCXU0cFr
+4TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUF
+BwEBBIGdMIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2ds
+b2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUH
+MAKGP2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAB1uluFS88lYI
+QPiuEvlALX1GYfNZTNCJogeflb5E59zdd49Y7L5zs9IXbYLUMqSQrbLyv4i4nK4e
+bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
+HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
+xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
+VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
+99YJ9IIzYQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.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">e217</OrganizationName>
+    <OrganizationName xml:lang="en">e217</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ids-mannheim.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Oliver</GivenName>
+    <SurName>Schonefeld</SurName>
+    <EmailAddress>mailto:schonefeld@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Andreas</GivenName>
+    <SurName>Witt</SurName>
+    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>AAI</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br.xml b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
new file mode 100644
index 00000000..18e5cdfc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
@@ -0,0 +1,113 @@
+<?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.ifap.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">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifap.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifap.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
+SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
+YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
+LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
+KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
+BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
+dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
+EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
+e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
+KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
+QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
+MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
+PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
+tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
+34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
+IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
+BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.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.ifap.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.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.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>
+      
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
+SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
+YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
+LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
+KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
+BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
+dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
+EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
+e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
+KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
+QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
+MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
+PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
+tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
+34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
+IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
+BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.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">IFAP - Instituto Federal do Amapa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifap.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifap.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marco Pantoja</SurName>
+    <EmailAddress>marco.pantoja@ifap.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
new file mode 100644
index 00000000..5ae2df2d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
@@ -0,0 +1,113 @@
+<?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.ifpb.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">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifpb.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifpb.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
+NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
+LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
+ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
+feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
+SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
+Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.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.ifpb.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.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.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>
+      
+MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
+NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
+LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
+ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
+feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
+SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
+Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.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">IFPB - Instituto Federal da Paraiba</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifpb.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifpb.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jose Hermano Cavalcanti Filho</SurName>
+    <EmailAddress>jose.cavalcanti@ifpb.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.xml
new file mode 100644
index 00000000..6eb22eaf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
@@ -0,0 +1,111 @@
+<?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.ifto.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">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
+BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
+MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
+MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
+KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
+EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
+ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
+7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
+EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
+YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
+xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
+ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
+HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
+6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
+sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
+2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
+p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
+LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
+Lqis4w==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.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.ifto.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.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.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>
+      
+MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
+BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
+MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
+MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
+KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
+EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
+ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
+7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
+EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
+YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
+xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
+ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
+HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
+6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
+sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
+2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
+p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
+LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
+Lqis4w==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.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">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifto.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Ronaldo Vasconcelos Parente</SurName>
+    <EmailAddress>parente@ifto.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
index fc1cad74..80da0cfe 100644
--- a/swamid-interfederations-2.0/idp.lrz.de.xml
+++ b/swamid-interfederations-2.0/idp.lrz.de.xml
@@ -14,9 +14,9 @@
         <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="60" width="80">https://idp.lrz.de/idp/images/lrzlogo.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.lrz-muenchen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lrz-muenchen.de</mdui:InformationURL>
+        <mdui:Logo height="108" width="100">https://idp.lrz.de/idp/images/lrzlogo.jpg</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">
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
index 32c71a1b..6853c2a6 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nesc.gla.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National e-Science Centre, University of Glasgow.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-29T14:17:30Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
index 11b96eef..51d2f9ab 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -5,6 +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">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexxa</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">
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
index 676a22e2..bec0386e 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
-  <!--
-		This is a shibboleth.net Shibboleth IdP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
index d5c9c0f8..2a1e9fe5 100644
--- a/swamid-interfederations-2.0/idp.surfnet.nl.xml
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -1,62 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.surfnet.nl">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+<md:EntityDescriptor 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://idp.surfnet.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T00:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </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">surfnet.nl</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">SURFnet bv</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
+        <mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
+        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">SURFnet bv SURF konijn powered by</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">SURFnet bv SURF konijn surf surfnet powered by</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>MIIEVDCCAzygAwIBAgIJANm7yUGYaeG1MA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
-BAYTAk5MMRAwDgYDVQQKEwdTVVJGbmV0MREwDwYDVQQLEwhTZXJ2aWNlczEZMBcG
-A1UEAxMQRmVkZXJhdGllIEJlaGVlcjEqMCgGCSqGSIb3DQEJARYbZmVkZXJhdGll
-LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTA4MDYwNTE1MDgyMVoXDTIzMDYwMjE1MDgy
-MVoweTELMAkGA1UEBhMCTkwxEDAOBgNVBAoTB1NVUkZuZXQxETAPBgNVBAsTCFNl
-cnZpY2VzMRkwFwYDVQQDExBGZWRlcmF0aWUgQmVoZWVyMSowKAYJKoZIhvcNAQkB
-FhtmZWRlcmF0aWUtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/x+YuMaHyS3xeogfBB6hWrL4Frp+KzOuu4IixfhMHz3xI
-G5l7p2aNV8UrEXevOwMWCgMNxjfSLdZBgNhR14GBh2cVGCx9f/wUtB86scmkP3Pr
-RLoZWu/EIY6MEbgET3D3tkdGuVejQwwhJTlK2xxWHtEdEL5abjYLveDg6Lb6z9od
-ljFevylBMZO+5LwTjpa3+B+07oMZr2sV1yjsG2BEBwTFz4XZzJAabeK9UO836qhN
-ptktjffoCNen33tNCjzqci4wzgQef3CNA/Ef0tMKGotdldKC6FtHvXixmVY5RKUK
-Iutm8sRwne8XYqrD54BAgXZQ0ZovxFbvGhA77YXxAgMBAAGjgd4wgdswHQYDVR0O
-BBYEFJNoYjIYUrDN/h1+9BZYOTk7jQBNMIGrBgNVHSMEgaMwgaCAFJNoYjIYUrDN
-/h1+9BZYOTk7jQBNoX2kezB5MQswCQYDVQQGEwJOTDEQMA4GA1UEChMHU1VSRm5l
-dDERMA8GA1UECxMIU2VydmljZXMxGTAXBgNVBAMTEEZlZGVyYXRpZSBCZWhlZXIx
-KjAoBgkqhkiG9w0BCQEWG2ZlZGVyYXRpZS1iZWhlZXJAc3VyZm5ldC5ubIIJANm7
-yUGYaeG1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI4IxrYPwwjJ
-D9gO1Vzt8ByeQaRe+V0Mv5Ox9RlcXV33WX8Ny8hqUS4/kjs9v7JOuOw7TRop/4QJ
-IAv/LEXH9B+hQ96zdLGMCcHI2crWF8l0yZ/DtgkpdlcyS7dNbjLtedtmgrOMSQub
-LE02tqoSUR491mQbRuXD49+kJsHXZH8I1YZqOShzPZ7+ksvnBd64txhef8OBlCzE
-elT60nOC3Jm8k3i0HwPcCYfDrh6+MJfC2dvfgktAcyu8rm1Q/ZelxaaXok17wUKg
-D8nDrVCOfTND1RCGcqJ3YVjYDhBrMdK+5NSuC5KOJUpVZbKgTOilnOM7B/Os8HJC
-fxLkDyGV/oQ=
+          <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:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <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://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Fidp.surfnet.nl"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Fidp.surfnet.nl"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SURFnet BV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SURFnet BV</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AAI Beheer</SurName>
-    <EmailAddress>aai-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>SURFfederatie Beheer</GivenName>
-    <EmailAddress>federatie-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <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://engine.surfconext.nl/authentication/idp/single-sign-on/ba573f07093978e3852ddef0d2465b84"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SURFnet bv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet bv</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/</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/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
new file mode 100644
index 00000000..4ff0fa3a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.umk.pl.xml
@@ -0,0 +1,50 @@
+<?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://idp.umk.pl/simplesaml/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-22T14:05: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>
+      <shibmd:Scope regexp="false">umk.pl</shibmd:Scope>
+      <shibmd:Scope regexp="false">uni.torun.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University</mdui:DisplayName>
+        <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/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://idp.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NCU IdP</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>admin@umk.pl</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.xml
new file mode 100644
index 00000000..4322dd13
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unica.it.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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>
+    </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">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>
+        <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: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: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:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
+                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.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.unica.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.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">unica.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
+                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE= 
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.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 Cagliari</OrganizationName>
+    <OrganizationName xml:lang="en">Cagliari State University</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Cagliari</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Cagliari State University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://idp.unica.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Assistenza Tecnica</SurName>
+    <EmailAddress>idem-help@unica.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it.xml b/swamid-interfederations-2.0/idp.uniroma3.it.xml
index 756fb160..39be6e63 100644
--- a/swamid-interfederations-2.0/idp.uniroma3.it.xml
+++ b/swamid-interfederations-2.0/idp.uniroma3.it.xml
@@ -20,7 +20,33 @@
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIQZmU7qqTFMf3noCC8ZYFiWDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDMyOTAwMDAwMFoXDTEzMDMyODIzNTk1OVowYzELMAkGA1UEBhMCSVQxLDAqBgNVBAoMI1VuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFJvbWEgVFJFMQwwCgYDVQQLEwN0bGMxGDAWBgNVBAMTD2lkcC51bmlyb21hMy5pdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvalnJ3zA5zCJoa1FQQbjo8sLbyd9DY4BgPk1FC46BmYRhcOu5HwlYr8m7810EsKCgylMRnksK8CzCA2nbAeXngIs5VuGkl3Ny9J/WJT1ht+OGLHKK+3CYfE+19uUNIaJpmyTgTxfZeBDXInAOIB8BJuAbdx4RsdZJm5SOhhytI8CAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQXGuG/nkYdyfF0d3+XCCap+85V2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNoaWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmbtbACovfuf8KCWU/zWIqM/rtmd3wmW9hRSMlXQjznFtTMrkS3MHWsJeLbl5TRiV2W9tkeuL5edVx9M+qfBRjYuTuCklh4l3ZW1OzEL1r4gOO/BdLMszHFmE3fnU6c9hCU4Uvib6KN3vYrOdHmAj6EwTb1Zh/q5/QGdp5XAHSFvm/xtQe0bXtFG8VvV1wm9eQ9a08pY5R78cq/u3Bm48Tkp7/OKCPxUk2CTQDuheEJUlTgzjRcJjt3pHi12aMAnAEYC0ten3d8C479lx60c8RC87+gZfhaXryPh6OKmVPJOvdkSkLZJP94LTgZtNe5KH1RSUE6kv1A3tKEVkdzS70= </ds:X509Certificate>
+          <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>
@@ -48,7 +74,33 @@
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIQZmU7qqTFMf3noCC8ZYFiWDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDMyOTAwMDAwMFoXDTEzMDMyODIzNTk1OVowYzELMAkGA1UEBhMCSVQxLDAqBgNVBAoMI1VuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFJvbWEgVFJFMQwwCgYDVQQLEwN0bGMxGDAWBgNVBAMTD2lkcC51bmlyb21hMy5pdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvalnJ3zA5zCJoa1FQQbjo8sLbyd9DY4BgPk1FC46BmYRhcOu5HwlYr8m7810EsKCgylMRnksK8CzCA2nbAeXngIs5VuGkl3Ny9J/WJT1ht+OGLHKK+3CYfE+19uUNIaJpmyTgTxfZeBDXInAOIB8BJuAbdx4RsdZJm5SOhhytI8CAwEAAaOCAXowggF2MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQXGuG/nkYdyfF0d3+XCCap+85V2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNoaWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmbtbACovfuf8KCWU/zWIqM/rtmd3wmW9hRSMlXQjznFtTMrkS3MHWsJeLbl5TRiV2W9tkeuL5edVx9M+qfBRjYuTuCklh4l3ZW1OzEL1r4gOO/BdLMszHFmE3fnU6c9hCU4Uvib6KN3vYrOdHmAj6EwTb1Zh/q5/QGdp5XAHSFvm/xtQe0bXtFG8VvV1wm9eQ9a08pY5R78cq/u3Bm48Tkp7/OKCPxUk2CTQDuheEJUlTgzjRcJjt3pHi12aMAnAEYC0ten3d8C479lx60c8RC87+gZfhaXryPh6OKmVPJOvdkSkLZJP94LTgZtNe5KH1RSUE6kv1A3tKEVkdzS70= </ds:X509Certificate>
+          <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>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
index b0cea5b1..2926376b 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.iay.org.uk/idp/shibboleth">
-  <!--
-		This is a "SDSS (Fountainhall)" project test IdP running outside the University environment for Ian A. Young.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-30T16:36:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
index f5041740..918fa685 100644
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
@@ -9,7 +9,7 @@
   </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>
+      <shibmd:Scope regexp="false">ifsc.edu.br</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
         <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
index da4b6342..7ac7acc4 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
-  <!--
-		This is a Shibboleth Federated Issue Tracking Shibboleth SP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
new file mode 100644
index 00000000..d92188d7
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
@@ -0,0 +1,47 @@
+<?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://login.aai.pionier.net.pl/IdP/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-22T14:05: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>
+      <shibmd:Scope regexp="false">aai.pionier.net.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+            PIONIER Consortium Identity Provider 
+         </mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/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.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>PIONIER IdP</md:SurName>
+    <md:EmailAddress>admin@aai.pionier.net.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at.xml b/swamid-interfederations-2.0/login.fhv.at.xml
new file mode 100644
index 00000000..0f7ebb70
--- /dev/null
+++ b/swamid-interfederations-2.0/login.fhv.at.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.fhv.at/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</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">fhv.at</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
+        <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
+MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKxwsD9+OJckD5tkuEmbHOuzwYAtkRyXfVuV
+/Y4up4H8I+eUgqr44g+o4IiIjW/MQHqiottVUUeimuFzbiVwsr/VRzMQBJqNiE/h
+eT2TOnUzHh+nPuZDtVzwy2S5lMxpGI7a5v6IwGhLjf6jV9jJjB1VtQys6ofH7uqv
+jF75Jkz7X5cuPMRCXGaXEecWKeOLX0PaMsptIOUR+a6YXX2dOJbPJojH/E0OOlg2
+XxoizHzZceZF7K3Tr1SZX7mT7TjcFjCOIcbiL0hkrto5oSBkY1G77d3fdkyZvO8u
+65iPN5rVoJSuYe7aYjVqlDECQSHH46vNJXanepMmZ+iPU5K0tkECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMbG9naW4uZmh2LmF0hiNodHRwczovL2xvZ2luLmZodi5hdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1hyr7QdkMxYmdbqg/wxKiwGh9nUwDQYJ
+KoZIhvcNAQEFBQADggEBAHZCy5j4cx8jyYL6m6sY0oIzX9F5kVGPdKSXhjE85RrY
+GzGlRpXjBTA8CPlxnu99Wt4jZ2jjudwrw/bHLPwxOkZNALxj4HUa7T0cdWXCj3lR
+1b8iI5tXTYHmgjCbl+UTl/WA8YVQvA4v+2RaBMduspAFsvjwZDDOXvskLB4Aflbu
+ewmlLixdIpZYWbQTkSovm0InLzBuoF77CFul8Nt2oIlbLg9Qfd4f94RsaNx/2MrZ
+/YXD0gncEwV9ijUqIUGJuGicMrTGeLhxlr6bltA8K9RyTgAU3dCImRUX0tbK0jRa
+ApOxw/gcmrRQwbhGEghVXhv3KlZ/xEkpVndXwiF651w=
+                    </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://login.fhv.at/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
index f8e29223..5b176203 100644
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -25,7 +25,7 @@
         <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
       </mdui:DiscoHints>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -58,6 +58,31 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
+                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -71,7 +96,7 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
     </Extensions>
-    <KeyDescriptor use="signing">
+    <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -104,6 +129,31 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
+                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org.xml
index aeadef22..bd8fb45f 100644
--- a/swamid-interfederations-2.0/login.terena.org.xml
+++ b/swamid-interfederations-2.0/login.terena.org.xml
@@ -1,63 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+<md:EntityDescriptor 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://login.terena.org/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </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">terena.org</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
+        <mdui:Description xml:lang="en">TERENA Secretariat</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/terena.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">TERENA Secretariat Trans-European Research and Education Networking Association </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>MIIEVDCCAzygAwIBAgIJANm7yUGYaeG1MA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
-BAYTAk5MMRAwDgYDVQQKEwdTVVJGbmV0MREwDwYDVQQLEwhTZXJ2aWNlczEZMBcG
-A1UEAxMQRmVkZXJhdGllIEJlaGVlcjEqMCgGCSqGSIb3DQEJARYbZmVkZXJhdGll
-LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTA4MDYwNTE1MDgyMVoXDTIzMDYwMjE1MDgy
-MVoweTELMAkGA1UEBhMCTkwxEDAOBgNVBAoTB1NVUkZuZXQxETAPBgNVBAsTCFNl
-cnZpY2VzMRkwFwYDVQQDExBGZWRlcmF0aWUgQmVoZWVyMSowKAYJKoZIhvcNAQkB
-FhtmZWRlcmF0aWUtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/x+YuMaHyS3xeogfBB6hWrL4Frp+KzOuu4IixfhMHz3xI
-G5l7p2aNV8UrEXevOwMWCgMNxjfSLdZBgNhR14GBh2cVGCx9f/wUtB86scmkP3Pr
-RLoZWu/EIY6MEbgET3D3tkdGuVejQwwhJTlK2xxWHtEdEL5abjYLveDg6Lb6z9od
-ljFevylBMZO+5LwTjpa3+B+07oMZr2sV1yjsG2BEBwTFz4XZzJAabeK9UO836qhN
-ptktjffoCNen33tNCjzqci4wzgQef3CNA/Ef0tMKGotdldKC6FtHvXixmVY5RKUK
-Iutm8sRwne8XYqrD54BAgXZQ0ZovxFbvGhA77YXxAgMBAAGjgd4wgdswHQYDVR0O
-BBYEFJNoYjIYUrDN/h1+9BZYOTk7jQBNMIGrBgNVHSMEgaMwgaCAFJNoYjIYUrDN
-/h1+9BZYOTk7jQBNoX2kezB5MQswCQYDVQQGEwJOTDEQMA4GA1UEChMHU1VSRm5l
-dDERMA8GA1UECxMIU2VydmljZXMxGTAXBgNVBAMTEEZlZGVyYXRpZSBCZWhlZXIx
-KjAoBgkqhkiG9w0BCQEWG2ZlZGVyYXRpZS1iZWhlZXJAc3VyZm5ldC5ubIIJANm7
-yUGYaeG1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI4IxrYPwwjJ
-D9gO1Vzt8ByeQaRe+V0Mv5Ox9RlcXV33WX8Ny8hqUS4/kjs9v7JOuOw7TRop/4QJ
-IAv/LEXH9B+hQ96zdLGMCcHI2crWF8l0yZ/DtgkpdlcyS7dNbjLtedtmgrOMSQub
-LE02tqoSUR491mQbRuXD49+kJsHXZH8I1YZqOShzPZ7+ksvnBd64txhef8OBlCzE
-elT60nOC3Jm8k3i0HwPcCYfDrh6+MJfC2dvfgktAcyu8rm1Q/ZelxaaXok17wUKg
-D8nDrVCOfTND1RCGcqJ3YVjYDhBrMdK+5NSuC5KOJUpVZbKgTOilnOM7B/Os8HJC
-fxLkDyGV/oQ=
+          <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:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <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://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Flogin.terena.org%252Fidp%252Fsaml2%252Fidp%252Fmetadata.php"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Flogin.terena.org%252Fidp%252Fsaml2%252Fidp%252Fmetadata.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TERENA Secretariat</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TERENA Secretariat</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>AAI Beheer</SurName>
-    <EmailAddress>aai-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>SURFfederatie Beheer</GivenName>
-    <EmailAddress>federatie-beheer@surfnet.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <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://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org</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/marte.ifsertao-pe.edu.br.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
index 11b6587d..3e3c7e64 100644
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
@@ -23,28 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExPzA9BgNVBAoTNklGU0VSVEFP
-LVBFIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gU2VydGFvIFBlcm5hbWJ1Y2FubzEN
-MAsGA1UECxMEREdUSTEmMCQGCSqGSIb3DQEJARYXY2FmZUBpZnNlcnRhby1wZS5l
-ZHUuYnIxEjAQBgNVBAcTCVBldHJvbGluYTETMBEGA1UECBMKUGVybmFtYnVjbzEL
-MAkGA1UEBhMCQlIxITAfBgNVBAMTGG1hcnRlLmlmc2VydGFvLXBlLmVkdS5icjAe
-Fw0xMzExMDcyMjAxMjNaFw0xNjExMDYyMjAxMjNaMIHRMT8wPQYDVQQKEzZJRlNF
-UlRBTy1QRSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFNlcnRhbyBQZXJuYW1idWNh
-bm8xDTALBgNVBAsTBERHVEkxJjAkBgkqhkiG9w0BCQEWF2NhZmVAaWZzZXJ0YW8t
-cGUuZWR1LmJyMRIwEAYDVQQHEwlQZXRyb2xpbmExEzARBgNVBAgTClBlcm5hbWJ1
-Y28xCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhtYXJ0ZS5pZnNlcnRhby1wZS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0XjYgQ3i0/lnuTWPm
-72+rOSLwsV4f7EHdO64F7+u1EZt+oVOsMpBy3XbYBgwPlnNbb9aFJr85Z/YzEz5h
-f4WxdMBkvPWx+cLkrqT+2RezY8rYAcRAwdSzAyeBj1MYpBqOM9rt81jmKMZmqUpJ
-67LgspIM9jGjzLmBKgJn6XF2J+p+0KoiEJacp06FtvZ/Yk+Qyi7oAvb0lOWk1vmm
-odEU5nPkgk6bJQvXn0+mmeuXsI9tRsdnjx2YFKt7EMDv3jim7B7tV+yi4IXNm7gw
-y1l8vWI49FO6hyCMf6n5RxtOi+iigHUD59DcvqRaHIVb3IDKGoSCbS0T1KsS68ea
-TK2BAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAERb5Q9f6FAAky4YOyhcUWKq6mYp
-CCuySwWySQ4qlDbEGW0WcMciyMAtwIHQQM9+AO5vV0ONnDNoPIXihU68as60CC4R
-VnP4NL7BM/whl8vpWpVtlCttrI/S7YLHmaTpQ7X8ncPlDqdO7hrjG/L5TViNnhhO
-YUAy6pOD0EfhHMLhBBYUZ5a9VlD+Oc+0oly55w+96OgMi2wmJyXWyEhtziwjmkJJ
-duGfVseh8yfame8Or1oBl/b3Z6cREKxO88xMbWRBAvPAkbBL9viFnV/HGhEjL35m
-hTgbWNwA4WPcsuB6dnJek24EPtMJYAR88eiNtijmGZP+23mUoIpOTvOhGUo=
+    MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,29 +66,27 @@ hTgbWNwA4WPcsuB6dnJek24EPtMJYAR88eiNtijmGZP+23mUoIpOTvOhGUo=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExPzA9BgNVBAoTNklGU0VSVEFP
-LVBFIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gU2VydGFvIFBlcm5hbWJ1Y2FubzEN
-MAsGA1UECxMEREdUSTEmMCQGCSqGSIb3DQEJARYXY2FmZUBpZnNlcnRhby1wZS5l
-ZHUuYnIxEjAQBgNVBAcTCVBldHJvbGluYTETMBEGA1UECBMKUGVybmFtYnVjbzEL
-MAkGA1UEBhMCQlIxITAfBgNVBAMTGG1hcnRlLmlmc2VydGFvLXBlLmVkdS5icjAe
-Fw0xMzExMDcyMjAxMjNaFw0xNjExMDYyMjAxMjNaMIHRMT8wPQYDVQQKEzZJRlNF
-UlRBTy1QRSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFNlcnRhbyBQZXJuYW1idWNh
-bm8xDTALBgNVBAsTBERHVEkxJjAkBgkqhkiG9w0BCQEWF2NhZmVAaWZzZXJ0YW8t
-cGUuZWR1LmJyMRIwEAYDVQQHEwlQZXRyb2xpbmExEzARBgNVBAgTClBlcm5hbWJ1
-Y28xCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhtYXJ0ZS5pZnNlcnRhby1wZS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0XjYgQ3i0/lnuTWPm
-72+rOSLwsV4f7EHdO64F7+u1EZt+oVOsMpBy3XbYBgwPlnNbb9aFJr85Z/YzEz5h
-f4WxdMBkvPWx+cLkrqT+2RezY8rYAcRAwdSzAyeBj1MYpBqOM9rt81jmKMZmqUpJ
-67LgspIM9jGjzLmBKgJn6XF2J+p+0KoiEJacp06FtvZ/Yk+Qyi7oAvb0lOWk1vmm
-odEU5nPkgk6bJQvXn0+mmeuXsI9tRsdnjx2YFKt7EMDv3jim7B7tV+yi4IXNm7gw
-y1l8vWI49FO6hyCMf6n5RxtOi+iigHUD59DcvqRaHIVb3IDKGoSCbS0T1KsS68ea
-TK2BAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAERb5Q9f6FAAky4YOyhcUWKq6mYp
-CCuySwWySQ4qlDbEGW0WcMciyMAtwIHQQM9+AO5vV0ONnDNoPIXihU68as60CC4R
-VnP4NL7BM/whl8vpWpVtlCttrI/S7YLHmaTpQ7X8ncPlDqdO7hrjG/L5TViNnhhO
-YUAy6pOD0EfhHMLhBBYUZ5a9VlD+Oc+0oly55w+96OgMi2wmJyXWyEhtziwjmkJJ
-duGfVseh8yfame8Or1oBl/b3Z6cREKxO88xMbWRBAvPAkbBL9viFnV/HGhEjL35m
-hTgbWNwA4WPcsuB6dnJek24EPtMJYAR88eiNtijmGZP+23mUoIpOTvOhGUo=
-
+MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu.xml b/swamid-interfederations-2.0/neugrid4you.eu.xml
index 011d91ed..3b9cac46 100644
--- a/swamid-interfederations-2.0/neugrid4you.eu.xml
+++ b/swamid-interfederations-2.0/neugrid4you.eu.xml
@@ -68,7 +68,7 @@ avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
       <ServiceName xml:lang="en">neuGRID for you</ServiceName>
       <ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</ServiceDescription>
       <ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</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="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>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 8e67777f..0d66e714 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,8 +1,28 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</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>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
         </ds:X509Data>
@@ -12,24 +32,27 @@
     <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:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</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"/>
+      <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" 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="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
   <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:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
new file mode 100644
index 00000000..152c3742
--- /dev/null
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
+      <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: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://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
+          <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>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
+      <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</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">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>System</GivenName>
+    <SurName>Management</SurName>
+    <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Service</GivenName>
+    <SurName>Desk</SurName>
+    <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
index 162bb663..7b9c5700 100644
--- a/swamid-interfederations-2.0/qub.ac.uk.xml
+++ b/swamid-interfederations-2.0/qub.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qub.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Queen's University of Belfast.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:26:41Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
new file mode 100644
index 00000000..42229862
--- /dev/null
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://quod.lib.umich.edu/shibboleth-sp/acls">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
+      <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACLS Humanities E-Book</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
+        <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
+						PLcvWTRfLv+JNqoT2yM=
+					</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>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
+						PLcvWTRfLv+JNqoT2yM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</ServiceName>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Michigan</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://humanitiesebook.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>University of Michigan Library IT</GivenName>
+    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>University of Michigan Library IT</GivenName>
+    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
new file mode 100644
index 00000000..8a86f7c0
--- /dev/null
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.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://rnp-cafe.ifs.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">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifs.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
+c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
+hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
+VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
+LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
+VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
+T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
+QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
+E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
+grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
+G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
+6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
+0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
+3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
+DZqccZQCmzfE8nJworc=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.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>
+      
+MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
+c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
+hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
+VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
+LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
+VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
+T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
+QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
+E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
+grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
+G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
+6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
+0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
+3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
+DZqccZQCmzfE8nJworc=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.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">IFS - Instituto Federal Sergipe</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifs.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifs.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Joao Silvio</SurName>
+    <EmailAddress>coimr@ifs.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br.xml b/swamid-interfederations-2.0/ross.impa.br.xml
index 83150aa9..a25190fc 100644
--- a/swamid-interfederations-2.0/ross.impa.br.xml
+++ b/swamid-interfederations-2.0/ross.impa.br.xml
@@ -23,29 +23,22 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEPjCCAyYCAQAwDQYJKoZIhvcNAQEFBQAwgeQxQjBABgNVBAoTOUlNUEEgLSBB
-c3NvY2lhY2FvIEluc3RpdHV0byBkZSBNYXRlbWF0aWNhIFB1cmEgZSBBcGxpY2Fk
-YTEpMCcGA1UECxMgQ0lOIC0gQ29vcmRlbmFjYW8gZGUgSW5mb3JtYXRpY2ExHTAb
-BgkqhkiG9w0BCQEWDm5ldGFkbUBpbXBhLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
-ZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRUwEwYD
-VQQDEwxyb3NzLmltcGEuYnIwHhcNMTMxMDAxMTE0NTE4WhcNMTgwOTMwMTE0NTE4
-WjCB5DFCMEAGA1UEChM5SU1QQSAtIEFzc29jaWFjYW8gSW5zdGl0dXRvIGRlIE1h
-dGVtYXRpY2EgUHVyYSBlIEFwbGljYWRhMSkwJwYDVQQLEyBDSU4gLSBDb29yZGVu
-YWNhbyBkZSBJbmZvcm1hdGljYTEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEu
-YnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFu
-ZWlybzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDHJvc3MuaW1wYS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQcfC7yePgWciiyBIGNDkZ3SZqHez1l
-qiOAXIw+OVvJRseEjtbZ79Pn4J6h/KdhWXdjbyh2eLl2nfAuknG/GKG49vjXNyDO
-IE+IpYtxAJM72TBJWJBV6UsABeZ0eFrv4IIG7bMRW+o5SerrRI15JBk7JxthpLUe
-aNWiceHaVgKwzkIAoZddqydn9UgTCPZ/zFuRTtBKLLfnf2mhuk1F6Jf47MjAn6KK
-jS4AVyqNE1jOBHTrSLP9ewlnA4WkYd9OFucn2Tvr52e+aiugH2DvYZR5qHSsqMYf
-s+VMeqAkDYnJpVSoaft3cG29r6K+730hGKOa26pKa/WG77blTNPcVasCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAWPh2+AT8lHSvyolzP05IRx6aMG1YTyme4Uj24Ta/
-+N7snK7GvsQxN6c2vbXd7D55yBZvIfW+bMjWtSCZu6xV4LAaL+mqJSEu7+Ua8hOD
-DfVF9Vt2RtfQLNnWNzFYdBlZA9yPA0odp0hZY8y6ewV4xCbhUPFAPI47NQqICkDE
-wfC1BFWyJtOZ4/cxTKuA2Zdx9NQJQMY4g3i8fwRg3JJbb/OoSYwLWB/rW9hXCZ/T
-mSefwDiMtc1cABuLXEe6ijr7fI3MFBnhHdp0G6+eZ93SZ2IQGBk0d4gTapyYTlGk
-SYPbrmjUagqqGhnjWHPTrUyhVMCABShIRHh6/Vxc+lp/KA==
+    MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
+DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
+OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
+HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
+Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
+mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
+zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
+NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
+vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
+JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
+ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
+BQbIol8hjh2qNA/n
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,29 +61,22 @@ SYPbrmjUagqqGhnjWHPTrUyhVMCABShIRHh6/Vxc+lp/KA==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEPjCCAyYCAQAwDQYJKoZIhvcNAQEFBQAwgeQxQjBABgNVBAoTOUlNUEEgLSBB
-c3NvY2lhY2FvIEluc3RpdHV0byBkZSBNYXRlbWF0aWNhIFB1cmEgZSBBcGxpY2Fk
-YTEpMCcGA1UECxMgQ0lOIC0gQ29vcmRlbmFjYW8gZGUgSW5mb3JtYXRpY2ExHTAb
-BgkqhkiG9w0BCQEWDm5ldGFkbUBpbXBhLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
-ZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRUwEwYD
-VQQDEwxyb3NzLmltcGEuYnIwHhcNMTMxMDAxMTE0NTE4WhcNMTgwOTMwMTE0NTE4
-WjCB5DFCMEAGA1UEChM5SU1QQSAtIEFzc29jaWFjYW8gSW5zdGl0dXRvIGRlIE1h
-dGVtYXRpY2EgUHVyYSBlIEFwbGljYWRhMSkwJwYDVQQLEyBDSU4gLSBDb29yZGVu
-YWNhbyBkZSBJbmZvcm1hdGljYTEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEu
-YnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFu
-ZWlybzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDHJvc3MuaW1wYS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQcfC7yePgWciiyBIGNDkZ3SZqHez1l
-qiOAXIw+OVvJRseEjtbZ79Pn4J6h/KdhWXdjbyh2eLl2nfAuknG/GKG49vjXNyDO
-IE+IpYtxAJM72TBJWJBV6UsABeZ0eFrv4IIG7bMRW+o5SerrRI15JBk7JxthpLUe
-aNWiceHaVgKwzkIAoZddqydn9UgTCPZ/zFuRTtBKLLfnf2mhuk1F6Jf47MjAn6KK
-jS4AVyqNE1jOBHTrSLP9ewlnA4WkYd9OFucn2Tvr52e+aiugH2DvYZR5qHSsqMYf
-s+VMeqAkDYnJpVSoaft3cG29r6K+730hGKOa26pKa/WG77blTNPcVasCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAWPh2+AT8lHSvyolzP05IRx6aMG1YTyme4Uj24Ta/
-+N7snK7GvsQxN6c2vbXd7D55yBZvIfW+bMjWtSCZu6xV4LAaL+mqJSEu7+Ua8hOD
-DfVF9Vt2RtfQLNnWNzFYdBlZA9yPA0odp0hZY8y6ewV4xCbhUPFAPI47NQqICkDE
-wfC1BFWyJtOZ4/cxTKuA2Zdx9NQJQMY4g3i8fwRg3JJbb/OoSYwLWB/rW9hXCZ/T
-mSefwDiMtc1cABuLXEe6ijr7fI3MFBnhHdp0G6+eZ93SZ2IQGBk0d4gTapyYTlGk
-SYPbrmjUagqqGhnjWHPTrUyhVMCABShIRHh6/Vxc+lp/KA==
+MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
+DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
+OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
+HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
+Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
+mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
+zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
+NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
+vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
+JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
+ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
+BQbIol8hjh2qNA/n
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index ef0b9a6a..52f6f985 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,9 +1,19 @@
 <?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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
@@ -12,12 +22,8 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
@@ -48,104 +54,104 @@ rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
 PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</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>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <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://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</ServiceName>
+      <ServiceName xml:lang="en">Haka Attribute Test Service</ServiceName>
+      <ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</ServiceDescription>
+      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" 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="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" 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="eduCourseMember" 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" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduCourseOffering" 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" 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="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="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="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="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="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="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="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="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" 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="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" 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="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="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="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" 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="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="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="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="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="Nickname" 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="o" Name="urn:oid:2.5.4.10" 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="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" 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="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" 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="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="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" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" 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="street" Name="urn:oid:2.5.4.9" 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="title" Name="urn:oid:2.5.4.12" 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="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Kari</GivenName>
+    <SurName>Laalo</SurName>
+    <EmailAddress>mailto:kari.laalo@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Timo</GivenName>
+    <SurName>Mustonen</SurName>
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it.xml b/swamid-interfederations-2.0/sgw.garr.it.xml
index 97f15c38..617e8dc0 100644
--- a/swamid-interfederations-2.0/sgw.garr.it.xml
+++ b/swamid-interfederations-2.0/sgw.garr.it.xml
@@ -7,7 +7,8 @@
   </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://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
+      <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
@@ -19,87 +20,60 @@
         <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <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=sgw.garr.it</ds:X509SubjectName>
-          <ds:X509Certificate>
-                            MIIEXTCCA0WgAwIBAgIQWujYl4SUR3QcC4FsP9F0yTANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowPTELMAkGA1UE
-                            BhMCSVQxGDAWBgNVBAoTD0NvbnNvcnRpdW0gR0FSUjEUMBIGA1UEAxMLc2d3Lmdh
-                            cnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ1uz7FWOS0k5y
-                            xcB9Ac60XgUBnXPC7MXiHLvDhpJpQHHGz1awLAuOr/WvqJxJ6ZwpD2sU72bt44GF
-                            uqlmdg2waASa/xDKP3oPGgnC7ximlK1UAQ/fbcSnjBprgRHZeJyQxndf1EGtC4zB
-                            qSi3yNprVqZsysw/7ew/KIMQ8un/a1ULfOfNedzIx1RXZeN85Hk+BQWxfuKkcLA+
-                            BRg5WuOP/7N/l9KGkDGmTsTsGkcGBUVtsKycIGUis9D4ZxpD7eYG66StcQE+uTnG
-                            37Yahsq9mELkWxBWy3HdxvEnNHtcqucuWS0YGaZMIYddeDd5IxZfzOq/WKkMggAF
-                            3alpftPFAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-                            kOO57TAdBgNVHQ4EFgQU88beKAx83mumGu58e947oiBNXbQwDgYDVR0PAQH/BAQD
-                            AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-                            MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
-                            cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
-                            AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
-                            UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
-                            YS5vcmcwFgYDVR0RBA8wDYILc2d3LmdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEB
-                            AH7+kdSsi31EBdjCDpBgnGpN37P/6ZlHhbRMMx4O0xtC6PIiGIvqW45DUFcPXkpb
-                            C4LZ3lqpz5oTI1l+E/7pWH7c7+xSKucqiwABtbTn4EteSfeZ4R58A0QXwKclwHwU
-                            TsaqtOwB/U2i0a9l/P5cL4fz7wFcREAPLsm6FVY5ZJP2aAAZEQO3C8tXuwym5oXB
-                            /W5PcRc2PRNAR0ZXuB5CQVNVEbqkHMXsNfVh5Lmr8TtdN9bkDUQYQmHKf4ynfEY4
-                            F/KOSR7Wtz++Fh/cG44uZgU7G7VdMUjmHVPSgwnqmYR56oXPkRmkloq25Qy0/moN
-                            GApBYHSfMtsnpP9U+0RncPM=
-                        </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>sgw.garr.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sgw.garr.it</ds:X509SubjectName>
-          <ds:X509Certificate>
-                            MIIEXTCCA0WgAwIBAgIQWujYl4SUR3QcC4FsP9F0yTANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowPTELMAkGA1UE
-                            BhMCSVQxGDAWBgNVBAoTD0NvbnNvcnRpdW0gR0FSUjEUMBIGA1UEAxMLc2d3Lmdh
-                            cnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ1uz7FWOS0k5y
-                            xcB9Ac60XgUBnXPC7MXiHLvDhpJpQHHGz1awLAuOr/WvqJxJ6ZwpD2sU72bt44GF
-                            uqlmdg2waASa/xDKP3oPGgnC7ximlK1UAQ/fbcSnjBprgRHZeJyQxndf1EGtC4zB
-                            qSi3yNprVqZsysw/7ew/KIMQ8un/a1ULfOfNedzIx1RXZeN85Hk+BQWxfuKkcLA+
-                            BRg5WuOP/7N/l9KGkDGmTsTsGkcGBUVtsKycIGUis9D4ZxpD7eYG66StcQE+uTnG
-                            37Yahsq9mELkWxBWy3HdxvEnNHtcqucuWS0YGaZMIYddeDd5IxZfzOq/WKkMggAF
-                            3alpftPFAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-                            kOO57TAdBgNVHQ4EFgQU88beKAx83mumGu58e947oiBNXbQwDgYDVR0PAQH/BAQD
-                            AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-                            MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
-                            cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
-                            AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
-                            UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
-                            YS5vcmcwFgYDVR0RBA8wDYILc2d3LmdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEB
-                            AH7+kdSsi31EBdjCDpBgnGpN37P/6ZlHhbRMMx4O0xtC6PIiGIvqW45DUFcPXkpb
-                            C4LZ3lqpz5oTI1l+E/7pWH7c7+xSKucqiwABtbTn4EteSfeZ4R58A0QXwKclwHwU
-                            TsaqtOwB/U2i0a9l/P5cL4fz7wFcREAPLsm6FVY5ZJP2aAAZEQO3C8tXuwym5oXB
-                            /W5PcRc2PRNAR0ZXuB5CQVNVEbqkHMXsNfVh5Lmr8TtdN9bkDUQYQmHKf4ynfEY4
-                            F/KOSR7Wtz++Fh/cG44uZgU7G7VdMUjmHVPSgwnqmYR56oXPkRmkloq25Qy0/moN
-                            GApBYHSfMtsnpP9U+0RncPM=
+          <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:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/NIM/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>
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.xml
index 5164f2a5..e2963802 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp-dev.cf.ac.uk/shibboleth">
-  <!--
-		This is a Shib Test SP owned by Cardiff University.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-23T14:26:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it.xml b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
new file mode 100644
index 00000000..c4d9b76c
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
@@ -0,0 +1,111 @@
+<?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.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
index d9b4bb4d..4a14e4df 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of Manchester.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-04T15:35:56.421696Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/shib.ufg.br.xml b/swamid-interfederations-2.0/shib.ufg.br.xml
index 9f833ab1..5b9af2c7 100644
--- a/swamid-interfederations-2.0/shib.ufg.br.xml
+++ b/swamid-interfederations-2.0/shib.ufg.br.xml
@@ -23,28 +23,25 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLTArBgNVBAoUJFVGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvacOhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXNAY2VyY29tcC51ZmcuYnIxETAPBgNVBAcUCEdvacOibmlhMQ8wDQYD
-VQQIFAZHb2nDoXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAe
-Fw0xMTAzMTAxOTQ2MzZaFw0xNDAzMDkxOTQ2MzZaMIHRMS0wKwYDVQQKFCRVRkcg
-LSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2nDoXMxNDAyBgNVBAsTK0NFUkNP
-TVAgLSBDZW50cm8gZGUgUmVjdXJzb3MgQ29tcHV0YWNpb25haXMxIzAhBgkqhkiG
-9w0BCQEWFHJlZGVzQGNlcmNvbXAudWZnLmJyMREwDwYDVQQHFAhHb2nDom5pYTEP
-MA0GA1UECBQGR29pw6FzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51Zmcu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENay
-VRf+lRcFHvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7
-U1FGdLZHZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8
-OjggQmFAot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M
-4Q1jPKitFkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb
-7ZbOdqsDg/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnY
-xZeBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJSsyw+/FRhaSSFPutZN5upO6q/A
-lrui0K4WMGeEh6mJmZu2vX1MB2H7ljxtxZ2I1Gmi4/oNzLzzz4o4lglpN0jnnWx0
-VBZYB+hVNrn03riHaAj9lB4H0IvPGkjsz5j0WM/1To5Mi6iFY+1ac+1p2oFdIWLX
-voqnzQVYm+5/3zSbVVYFRE5YA655K80+D5F1CxGaaSeEl61lX8G3ncyLJ8GjGQy7
-EuXcPceE+fwojuBV3wZl5Hl6OkeoB9sS+7zuPyc7TWTLxCsrWHRDWlRtargNuxPn
-2KF7d+EaJHILB9sC/ESy/4TMy+XvpU/T1ylvRR2+bW24nPGKHuGuqmETC6I=
+    MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
+A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
+NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
+hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
+MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
+FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
+tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
+YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
+qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
+qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
+k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
+4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
+3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
+f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
+JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,29 +64,25 @@ EuXcPceE+fwojuBV3wZl5Hl6OkeoB9sS+7zuPyc7TWTLxCsrWHRDWlRtargNuxPn
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLTArBgNVBAoUJFVGRyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIEdvacOhczE0MDIGA1UECxMrQ0VSQ09NUCAt
-IENlbnRybyBkZSBSZWN1cnNvcyBDb21wdXRhY2lvbmFpczEjMCEGCSqGSIb3DQEJ
-ARYUcmVkZXNAY2VyY29tcC51ZmcuYnIxETAPBgNVBAcUCEdvacOibmlhMQ8wDQYD
-VQQIFAZHb2nDoXMxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjAe
-Fw0xMTAzMTAxOTQ2MzZaFw0xNDAzMDkxOTQ2MzZaMIHRMS0wKwYDVQQKFCRVRkcg
-LSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBHb2nDoXMxNDAyBgNVBAsTK0NFUkNP
-TVAgLSBDZW50cm8gZGUgUmVjdXJzb3MgQ29tcHV0YWNpb25haXMxIzAhBgkqhkiG
-9w0BCQEWFHJlZGVzQGNlcmNvbXAudWZnLmJyMREwDwYDVQQHFAhHb2nDom5pYTEP
-MA0GA1UECBQGR29pw6FzMQswCQYDVQQGEwJCUjEUMBIGA1UEAxMLc2hpYi51Zmcu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjd7v1zv9XiZujENay
-VRf+lRcFHvUq3KtLFWnys3UhsAlQPiXl3rCdCV3qgC3mLFKoQtCIvxW0ubaX7E+7
-U1FGdLZHZBgkCXdvJ32wMtF/DEhiD/AwT6JMjSWLcE9eGK35NBaB6kC91Pn9oID8
-OjggQmFAot2NQ7KRlSNJg3nY3RQYCFZghgsLec9+0h/YHaRuKgDKcFnreAQ9UQ4M
-4Q1jPKitFkn/IJa2okSwXIu6gwV/2Y2I92ar3LgbNfpXCPW/gGqflkPEA+4AXwRb
-7ZbOdqsDg/PLMzi3jS4VHIOVUHx4fg7PZF+CEJpNG65i5pQB2d9VI2he2e3gUtnY
-xZeBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJSsyw+/FRhaSSFPutZN5upO6q/A
-lrui0K4WMGeEh6mJmZu2vX1MB2H7ljxtxZ2I1Gmi4/oNzLzzz4o4lglpN0jnnWx0
-VBZYB+hVNrn03riHaAj9lB4H0IvPGkjsz5j0WM/1To5Mi6iFY+1ac+1p2oFdIWLX
-voqnzQVYm+5/3zSbVVYFRE5YA655K80+D5F1CxGaaSeEl61lX8G3ncyLJ8GjGQy7
-EuXcPceE+fwojuBV3wZl5Hl6OkeoB9sS+7zuPyc7TWTLxCsrWHRDWlRtargNuxPn
-2KF7d+EaJHILB9sC/ESy/4TMy+XvpU/T1ylvRR2+bW24nPGKHuGuqmETC6I=
-
+MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
+A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
+NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
+hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
+MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
+FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
+tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
+YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
+qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
+qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
+k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
+4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
+3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
+f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
+JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
new file mode 100644
index 00000000..2604e5a6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.gwdg.de/gwdg/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
+      <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">gwdg.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
+        <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
+        <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
+ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
+FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
+QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
+i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
+0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
+gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
+LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
+c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
+shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
+eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
+rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
+mNIjImyl26Rs6RqKxw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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-idp.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/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">gwdg.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
+ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
+FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
+QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
+i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
+0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
+gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
+LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
+c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
+shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
+eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
+rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
+mNIjImyl26Rs6RqKxw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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">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>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
new file mode 100644
index 00000000..f456acf5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fhwn.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</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">fhwn.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
+        <mdui:Logo height="85" width="125">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
+        <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
+I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
+BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
+aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.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">fhwn.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
+I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
+BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
+aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.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:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
new file mode 100644
index 00000000..30a947a5
--- /dev/null
+++ b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
@@ -0,0 +1,41 @@
+<?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://skmms-idp.lanet.lv">
+  <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/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://skmms-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - RCMC</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.rcmc.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
index 9c23ae4e..15af9807 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
@@ -96,8 +96,8 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
       <ServiceName xml:lang="en">RENATER - software forge for RENATER community</ServiceName>
       <ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</ServiceDescription>
       <ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</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="surname" Name="urn:oid:2.5.4.4" 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" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index b80de835..a6452c31 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,9 +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://sp.catalog.clarin.eu">
-  <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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
+      <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://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+        <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
 RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
 RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
@@ -29,37 +54,91 @@ s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
 fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
 ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
 nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certificate>
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</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://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: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">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>Tobias</md:GivenName>
-    <md:SurName>Vanvalkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
+MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxGjAYBgNVBAMTEWNhdGFsb2cuY2xhcmlu
+LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoF+pHBBTzECbn
+IK3k+WuiRpZCv/ECHgUqSq5mw+5x1ZOrP3qW1c/BL+mh8rPM3twPw1zh7faycCzb
+Wg6xjkzbvfnidFq394JdJ8OYHHd4629vF/QQlDiPU/WXNL1PWqh+JNoVbBeZI8Uz
++xglMyPaLn2rOTcVm5fqk6Do8DrubkZ7fxZ/4CkzJ8rTlFNOCcN8x5G2rWtcJYHa
+xS0ZBhmMt1AmqzWh7ZJCvgS9Wma4ZOhuh3xZSlaEB8o3HWAYprR6g7L+HFvmKdfK
+8oGbBViHUqsslr80Mtli15ZzxkkBH95fzYPdJTCAMccaqLhvQfjuChy7FsDYI5cV
+fvhaJQIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPV/s0egKEIbVq/6uW/GqGNX3RInMB8G
+A1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGG
+L2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/Bggr
+BgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCyMBGsYojEQdaSJnym2OQQ
+s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
+fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
+ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
+nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
+      <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
+      <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
+      <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</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="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="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="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Daan</GivenName>
+    <SurName>Broeder</SurName>
+    <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>van Valkenhoef</SurName>
+    <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
new file mode 100644
index 00000000..fc86ad57
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-08T21:53:28Z">
+      <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://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIEDeB+jDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxNDEx
+MDlaFw0xNDAzMTcxNDExMDlaMHwxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFzAVBgNVBAMTDmNvcnB1czEubXBpLm5s
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwvTzVbiFe7HH/LuUoYp
+n27Y2YuxPlXkiLFdMWCvSQVm4jPC1CIZmfJXB/khvySo/Ir/gjoe5gnvMj5co3zJ
+3S6dpgSjaWNZTYtl2cAfzMm5IbMKoAEsG+m3QWE1Zlbc9wT079CJe7YoqYYrHcFX
+Qy9ID7VFt9VQf8tCP86uRF9bxXO4wUvRlzzs65oGDMUS5u/+1bcge/xOrFFfUqVU
+Ebjtoh8L/cVtc4bEME5lVXxF26qrLCWSEDl8c+ULyrHMngRu/+utSSBQUJyqmEMd
+RLngB5GkB3Dvczd2d/NZy2XiqfjLFDA9Ok2HuJtSlYofeH/BwPM4dMgXB/lo16lY
+dwIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHxqV98GFaGyiUNK+C8zDnIYm5FxMB8GA1Ud
+IwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGGL2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWg
+M6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCvd62K/i554VZfOW9HtmKPKNdT
+Fe56uOS8p57Gg+HY+CUYMbmoL+rZqaYl+Uli8X5R5Pi4JU8Z88ttKSQ/+XISPP5/
+OE3022obFJ0ZUct2AWYgckmie10Kd5vXOxfw0Mn/cdZqCJAO64tzwk5el120LA1w
+rwtNxwRiR5VinZDirrm78RNC8wlr9iKFkVl3whTW6sdtE7AlZ0r9XaaigKS2wjNd
+4QC9LVo0aBpxR3ryo7+I31uKXQpNwLJSZXnD9pII4iKjmVDc1ndiu6rhO2TKF6lq
+yZtIZ9oG/5n1qef1ClZ+7d3uAl7ssvsV67Uj4JcTlR0UfYykUlPONDdsYqiu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIEDeB+jDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxNDEx
+MDlaFw0xNDAzMTcxNDExMDlaMHwxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFzAVBgNVBAMTDmNvcnB1czEubXBpLm5s
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwvTzVbiFe7HH/LuUoYp
+n27Y2YuxPlXkiLFdMWCvSQVm4jPC1CIZmfJXB/khvySo/Ir/gjoe5gnvMj5co3zJ
+3S6dpgSjaWNZTYtl2cAfzMm5IbMKoAEsG+m3QWE1Zlbc9wT079CJe7YoqYYrHcFX
+Qy9ID7VFt9VQf8tCP86uRF9bxXO4wUvRlzzs65oGDMUS5u/+1bcge/xOrFFfUqVU
+Ebjtoh8L/cVtc4bEME5lVXxF26qrLCWSEDl8c+ULyrHMngRu/+utSSBQUJyqmEMd
+RLngB5GkB3Dvczd2d/NZy2XiqfjLFDA9Ok2HuJtSlYofeH/BwPM4dMgXB/lo16lY
+dwIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
+CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHxqV98GFaGyiUNK+C8zDnIYm5FxMB8GA1Ud
+IwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGGL2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWg
+M6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCvd62K/i554VZfOW9HtmKPKNdT
+Fe56uOS8p57Gg+HY+CUYMbmoL+rZqaYl+Uli8X5R5Pi4JU8Z88ttKSQ/+XISPP5/
+OE3022obFJ0ZUct2AWYgckmie10Kd5vXOxfw0Mn/cdZqCJAO64tzwk5el120LA1w
+rwtNxwRiR5VinZDirrm78RNC8wlr9iKFkVl3whTW6sdtE7AlZ0r9XaaigKS2wjNd
+4QC9LVo0aBpxR3ryo7+I31uKXQpNwLJSZXnD9pII4iKjmVDc1ndiu6rhO2TKF6lq
+yZtIZ9oG/5n1qef1ClZ+7d3uAl7ssvsV67Uj4JcTlR0UfYykUlPONDdsYqiu
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</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">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>General</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
index 1c22a346..8430879b 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/kbplus">
-  <!--
-		This is an "EDINA Knowledge Base+" SP for the University of Edinburgh.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-27T15:54:52Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
index b6a85f66..d35d911d 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
@@ -1,9 +1,19 @@
 <?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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <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>
@@ -12,12 +22,8 @@
         <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="fi">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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
@@ -46,42 +52,42 @@ 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>
+    </KeyDescriptor>
+    <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-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</ServiceName>
+      <ServiceName xml:lang="en">Korp – search service for text material</ServiceName>
+      <ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</ServiceDescription>
+      <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="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="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Fin-Clarin</GivenName>
+    <EmailAddress>mailto:fin-clarin@helsinki.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Matthiesen</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Jyrki</GivenName>
+    <SurName>Niemi</SurName>
+    <EmailAddress>mailto:jyrki.niemi@helsinki.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 6db70753..cb70909f 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,9 +1,19 @@
 <?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="http://sp.lat.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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
@@ -16,12 +26,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.csc.fi/english/research/sciences/linguistics/lat-privacypolicy</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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
@@ -50,42 +56,42 @@ CiBkuiUynwqLsQKjfkcSZa5W9a8spV7y8LmCAEtDk8l03p45TKRvWIgMAexg/60h
 TE5WJb+s+lUOs3IoVL33fpbG+Aor</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://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">LAT – Language Archive Tools</md:ServiceName>
-      <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</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="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>Tero</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tero</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <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-POST" Location="https://lat.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">LAT – Language Archive Tools</ServiceName>
+      <ServiceName xml:lang="en">LAT – Language Archive Tools</ServiceName>
+      <ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</ServiceDescription>
+      <ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</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="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Tero</GivenName>
+    <SurName>Aalto</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Matthiesen</SurName>
+    <EmailAddress>mailto:martin.matthiesen@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Tero</GivenName>
+    <SurName>Aalto</SurName>
+    <EmailAddress>mailto:ling@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 62c8e7de..7f9a49b4 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,9 +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://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:KeyDescriptor>
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-04-27T09:05:42Z">
+      <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://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics second 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:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
 RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
 RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
@@ -29,37 +55,91 @@ LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
 3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
 A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
 7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</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://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: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>Tobias</md:GivenName>
-    <md:SurName>van Valkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+          <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>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider</ServiceName>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</ServiceName>
+      <ServiceDescription xml:lang="de">Max Planck Instituut voor Psycholinguistiek tweede Service Provider voor Taalkundige Services gericht op onderzoekers</ServiceDescription>
+      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</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="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="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="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>van Valkenhoef</SurName>
+    <EmailAddress>mailto:Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
new file mode 100644
index 00000000..0b2cdeda
--- /dev/null
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.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://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifma.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifma.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
+CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
+U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
+AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
+MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
+TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
+b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
+YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
+qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
+7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
+NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
+85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
+2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
+VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
+PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
+oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
+wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
+GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
+WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.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">ifma.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
+CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
+U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
+AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
+MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
+TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
+b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
+YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
+qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
+7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
+NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
+85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
+2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
+VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
+PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
+oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
+wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
+GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
+WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.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">IFMA - Instituto Federal do Maranhao</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifma.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifma.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Daniel Torres</SurName>
+    <EmailAddress>daniel.torres@ifma.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
new file mode 100644
index 00000000..7d8100ce
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
@@ -0,0 +1,47 @@
+<?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-22T14:05: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.siropglobal.org.xml b/swamid-interfederations-2.0/sso.siropglobal.org.xml
new file mode 100644
index 00000000..0c5356b3
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.siropglobal.org.xml
@@ -0,0 +1,76 @@
+<?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: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 urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
+aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhWvrjYWWW1NKLpSe
+I7Sk2ipB0yAwDQYJKoZIhvcNAQEFBQADggEBAGe5Qh3X+fQvQd8EPYP94b+XSfBJ
+tbvHyi6gBUkBMmnafb5Hzjh0901/Vb8AnKt2Ix4fpqreyIIPHI+03XaZBC8qETtN
+XIQEqHPpuTLZn+GcuF0M/twQHq1Gtn+XBC9wVlHsEw5LhI9ZsxauDQVXOvHJkSCF
+xoE4PKbmRhdC/yEleLcHkqJRZm2ghvQq8cXkz1y+dlWmNFbHxbwGVUyiXPKH9VXm
+7uHDTq8TquEldY5/NB0w+wk5fkizj0c5xV391YjOhbIHKJ27cZ12+/7iyjJJ0shj
+DP4gOoktkZlkyPT0AUi/samZ1GKtYrOGd9Z1/7fLlYYeFyA1QdFbBX5qxPM=
+						</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://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</ServiceName>
+      <ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</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="false"/>
+      <RequestedAttribute FriendlyName="surname" 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="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="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"/>
+      <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"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Andreas</GivenName>
+    <SurName>Brodbeck</SurName>
+    <EmailAddress>mailto:it@siropglobal.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Andreas</GivenName>
+    <SurName>Brodbeck</SurName>
+    <EmailAddress>mailto:andreas.brodbeck@mindclue.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index abdc0a93..8ddf0907 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi.xml
@@ -1,19 +1,20 @@
 <?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>
+<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" entityID="https://sso.utu.fi/sso-idp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</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>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
@@ -56,30 +57,30 @@ njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
 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">Abo 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">Abo 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>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>
+    </KeyDescriptor>
+    <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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">Turun yliopisto</OrganizationName>
+    <OrganizationName xml:lang="en">University of Turku</OrganizationName>
+    <OrganizationName xml:lang="sv">Abo universitet</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Abo universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.utu.fi/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.utu.fi/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petri</GivenName>
+    <SurName>Teraspuro</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Elina</GivenName>
+    <SurName>Toivanen</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</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.xml
index 65801dd9..f964b8cb 100644
--- a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
+++ b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
@@ -5,6 +5,11 @@
       <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>
   <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/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 2b484779..365a267f 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,13 +1,41 @@
 <?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:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
-  <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">user.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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">user.uu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University (old)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
+        <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uu.se</mdui:DomainHint>
+        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -24,27 +52,56 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+                    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se: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://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/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">user.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+          <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
+BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
+WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
+C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
+5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
+Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
+8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
+j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
+c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
+E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
+482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
+0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
+z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
+IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
+bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
+GP8s 
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se: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://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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">user.uu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -61,23 +118,52 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==</ds:X509Certificate>
+2DlT+A==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
+BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
+WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
+C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
+5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
+Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
+8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
+j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
+c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
+E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
+482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
+0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
+z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
+IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
+bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
+GP8s 
+          </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se: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">UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>AKKA SAML2</md:SurName>
-    <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se: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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">UU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet (gammal)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University (old)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala universitet</Company>
+    <SurName>AKKA SAML2</SurName>
+    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+  </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.xml
index f0ef7722..2bb210af 100644
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
@@ -1,11 +1,18 @@
 <?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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+<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://tcs-escience-portal.terena.org/simplesamlphp/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-05-03T16:37:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
+  </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>
+        <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -31,9 +38,4 @@
     <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>na@example.org</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
index e66abfa9..03b10873 100644
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+<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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
   <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</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">TERENA Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</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>MIIEdjCCA16gAwIBAgIQaDG9O4Jn+97HiMuVnaMmcDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDEyMjAwMDAwMFoXDTEzMDEyMTIzNTk1OVowRTELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTElMCMGA1UEAxMcdGNzLXBlcnNvbmFsLXNhbWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOCAW8wggFrMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSg83c02TvstcJr9ZOENi88KnuA+jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAnBgNVHREEIDAeghx0Y3MtcGVyc29uYWwtc2FtbC50ZXJlbmEub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQA12FYPotUO78yJ3gIa97kuYcQTX8ZwZXWm5hG39UOedTFCn7zFWCcmksL3BrT0rKp3KvRYkmQ9sQ28biv8kOfM0zlOhy7RMNCY/J5jKQpwdiRIWpzbcf+OfDmTmzBcxHJFEU8MwYjWUEwUbAfe+AYagTCZvYVx3tyfP0patzWDvg+c40nDFS4VGQ9NU9cPh1s+uYTblzh0SwDFWleT//JZELcRprsj9lEqH8wyNOEQEmtoEQn25lEpyEY4PacA7oKO95YdUEbqdlxkqtP69W8MpSKUyEXLW0fXBtoD86m7jEZD+V/5QyV8S9VUVCy+u3y2XmFeXbvUqzJHz9x3N25I</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
@@ -38,9 +38,4 @@
     <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UvT</md:GivenName>
-    <md:SurName>LIS Unix</md:SurName>
-    <md:EmailAddress>na@example.org</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..3b1161df 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +1,59 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <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">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 height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <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: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: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: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-2.0/test.federation.renater.fr.xml b/swamid-interfederations-2.0/test.federation.renater.fr.xml
index 3efd3959..1fedf255 100644
--- a/swamid-interfederations-2.0/test.federation.renater.fr.xml
+++ b/swamid-interfederations-2.0/test.federation.renater.fr.xml
@@ -87,7 +87,7 @@ Il faut configurer manuellement les filtres d'attributs pour cette ressource.</S
       <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="commonName" Name="urn:oid:2.5.4.3" 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="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"/>
@@ -100,14 +100,14 @@ Il faut configurer manuellement les filtres d'attributs pour cette ressource.</S
       <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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" 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="surname" Name="urn:oid:2.5.4.4" 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="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="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"/>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
index f2627d6f..3acfb604 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
-  <!--
-		This is a UK federation Shibboleth 2 test SP.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T11:19:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
new file mode 100644
index 00000000..eb765d01
--- /dev/null
+++ b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
@@ -0,0 +1,115 @@
+<?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">
+  <Extensions xmlns="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: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>
+  </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>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
+        <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</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://thalamoss-data.ics.muni.cz/auth/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://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
+ZGF0YS5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKUGwM1e1CiGbQVgLW460tAetS5QUTSANMKZEzThUgJYdI2mYJWp9NwF5bXelMo+
+lFObDPcG7wEc8+DpdpKGskBEE4SmcHbcKFE8/hmCYHPbf5AUrjPCei3XKDMbtIaC
+Htmut5AjE4gsG9GJa5vCFCjcsJgIdIat/PQp7++IOMc+qXx5WR22mUroYR15V89u
+jGe7CfjonOUmB4xxj5AVW73xcGEsAgYS1vmCGo3utSiawlgBKYENCTyb6e1AdbQ6
+MS1SBcN1gvFQH6ONoX2gXFG5NAEF1PCwevcUePVoJyUux5grmnBH6wE/7SOp8ygI
+7c6bUVZINmO9s5KY+Ohc7LUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT+kNRsn7KWuNVl5xuCU3uOlH3ElTAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIadGhhbGFtb3Nz
+LWRhdGEuaWNzLm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAGXev97kSHOHKFTd
+Pb2+xAETh0vA4q5UFVUF96i0yqpOlpmeWF7gV+7VCSI0WOVfWJQE8LeE17KRymb2
+h4G6AetotMBoKdzPxVmuSTIT2GA3q/cMeNWt9Kc1xaFZ73/vV9kJ5ioA/Vqpbk3B
+BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
+6kAGlj0ycmn4GA0vnQbgw7iAYh72rPmH2vvLyXrEf6wKo9L1ywQ7ag9BvQaxCLoT
+gRtPrP5JXkY5jYK6rsPAUltcTEPXxRkxG7CX92WXKlX5/1MXRk3wZV5ZYyh+TGKe
+3EudFd0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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="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: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="false"/>
+      <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="cn" Name="urn:oid:2.5.4.3" 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="false"/>
+      <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="o" Name="urn:oid:2.5.4.10" 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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Holub</md:SurName>
+    <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Sochor</md:SurName>
+    <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/theia.unifei.edu.br.xml b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
index 39a6116e..1a4aad9d 100644
--- a/swamid-interfederations-2.0/theia.unifei.edu.br.xml
+++ b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
@@ -23,26 +23,21 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxDzANBgNVBAoTBnVuaWZlaTEM
-MAoGA1UECxMDZHNpMSUwIwYJKoZIhvcNAQkBFhZldmVyYWxkb0B1bmlmZWkuZWR1
-LmJyMRAwDgYDVQQHEwdpdGFqdWJhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJ
-BgNVBAYTAkJSMRwwGgYDVQQDExN0aGVpYS51bmlmZWkuZWR1LmJyMB4XDTExMDIy
-MjE5NDEwNVoXDTE0MDIyMTE5NDEwNVowgZoxDzANBgNVBAoTBnVuaWZlaTEMMAoG
-A1UECxMDZHNpMSUwIwYJKoZIhvcNAQkBFhZldmVyYWxkb0B1bmlmZWkuZWR1LmJy
-MRAwDgYDVQQHEwdpdGFqdWJhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRwwGgYDVQQDExN0aGVpYS51bmlmZWkuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAszS24eQWB14ZsvJbc7/L0OIx91T7/x8eIMAg
-iljM/qQb6YscjrpRZF5sMgQExLzvkDWloF10S8tHdAJ85WtLcDHzL6yxv5PlP0dG
-0uA2QL1NqaFYziyasi3MOihRozQ3VyDJLit7nKjb3r9BFlRKxEHH2DzU8ya2q9im
-dlZH9o6jyLk3qYWc88OmshEaqFCzRQre0GPYyLxDgc9mMAtVcG1y5MF2IBxUHG2M
-exL5GNVVRxvH8r+z0ZXssC/35SGmgZXNP83TcAyo7gOcPiLfuNr3E552ffFDjw3i
-GJiR9iyw5sUFMDqMshDUZnaqXpAmHBOGGk/sxa8lcdlJDArBrQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBhktjReQRXN2QOley8nhzYJKTThbZdNWg9M7JhClsq43ys
-NMRPWVbGyFPealR7UEAY8NK2i/RBAwAQ1XGvUITAoICuHHzTYBc6EcXp22BEl+gN
-qDLyZOdNaLaWaMpRbd21dBOqe8CTGBxhes5Dwe/L0bBZgV/vHk9Qw6v9I+xaQroW
-3aGrRnyxD8rPbcvLGHUPfoFdskkG2Y7UQUAYy8QlDApcA9hbplhgz5cVmqAR+vli
-FBlXJ1FNxrGhVjRg4ULTHR4H5JA6OXRLjI9gVKPbWk1/SblGi01wStR79SPBXO9c
-2N3Q1WgSwTkR3BxJaxn8/S5iu4mQ+OXuVTxo5R0y
+    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>
@@ -65,27 +60,21 @@ FBlXJ1FNxrGhVjRg4ULTHR4H5JA6OXRLjI9gVKPbWk1/SblGi01wStR79SPBXO9c
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxDzANBgNVBAoTBnVuaWZlaTEM
-MAoGA1UECxMDZHNpMSUwIwYJKoZIhvcNAQkBFhZldmVyYWxkb0B1bmlmZWkuZWR1
-LmJyMRAwDgYDVQQHEwdpdGFqdWJhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJ
-BgNVBAYTAkJSMRwwGgYDVQQDExN0aGVpYS51bmlmZWkuZWR1LmJyMB4XDTExMDIy
-MjE5NDEwNVoXDTE0MDIyMTE5NDEwNVowgZoxDzANBgNVBAoTBnVuaWZlaTEMMAoG
-A1UECxMDZHNpMSUwIwYJKoZIhvcNAQkBFhZldmVyYWxkb0B1bmlmZWkuZWR1LmJy
-MRAwDgYDVQQHEwdpdGFqdWJhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNV
-BAYTAkJSMRwwGgYDVQQDExN0aGVpYS51bmlmZWkuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAszS24eQWB14ZsvJbc7/L0OIx91T7/x8eIMAg
-iljM/qQb6YscjrpRZF5sMgQExLzvkDWloF10S8tHdAJ85WtLcDHzL6yxv5PlP0dG
-0uA2QL1NqaFYziyasi3MOihRozQ3VyDJLit7nKjb3r9BFlRKxEHH2DzU8ya2q9im
-dlZH9o6jyLk3qYWc88OmshEaqFCzRQre0GPYyLxDgc9mMAtVcG1y5MF2IBxUHG2M
-exL5GNVVRxvH8r+z0ZXssC/35SGmgZXNP83TcAyo7gOcPiLfuNr3E552ffFDjw3i
-GJiR9iyw5sUFMDqMshDUZnaqXpAmHBOGGk/sxa8lcdlJDArBrQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBhktjReQRXN2QOley8nhzYJKTThbZdNWg9M7JhClsq43ys
-NMRPWVbGyFPealR7UEAY8NK2i/RBAwAQ1XGvUITAoICuHHzTYBc6EcXp22BEl+gN
-qDLyZOdNaLaWaMpRbd21dBOqe8CTGBxhes5Dwe/L0bBZgV/vHk9Qw6v9I+xaQroW
-3aGrRnyxD8rPbcvLGHUPfoFdskkG2Y7UQUAYy8QlDApcA9hbplhgz5cVmqAR+vli
-FBlXJ1FNxrGhVjRg4ULTHR4H5JA6OXRLjI9gVKPbWk1/SblGi01wStR79SPBXO9c
-2N3Q1WgSwTkR3BxJaxn8/S5iu4mQ+OXuVTxo5R0y
-
+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>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
new file mode 100644
index 00000000..13cdc05b
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
+						MuFyz7mc
+					</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>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
+						MuFyz7mc
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <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-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-adfs.geant.net/adfs/ls/" index="1"/>
+  </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">
+    <GivenName>DANTE IT Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE IT</GivenName>
+    <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.xml
index 8d1fdc15..4301e427 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
-  <!--
-		This is an 'Emerald UAT Site' Shibboleth SP for Emerald Group Publishing Ltd.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-06T16:03:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
index 4d0175e8..d3227fdf 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -4,6 +4,27 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
+    <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>
+    <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"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <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: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>
@@ -12,24 +33,23 @@
   <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">
     <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LINDAT-Clarin repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Repozitář LINDAT-Clarin</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Repository of LINDAT-Clarin project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář projektu LINDAT-Clarin Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
+        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Repozitář a služby projekty LINDAT/CLARIN</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN Ústavu formální a aplikované lingvistiky Matematicko-fyzikální fakulty Univerzity Karlovy v Praze</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</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://ufal-point.mff.cuni.cz/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://ufal-point.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
-      <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://ufal-point.mff.cuni.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://ufal-point.mff.cuni.cz/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://lindat.mff.cuni.cz/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://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <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://lindat.mff.cuni.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://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
     </Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>Active</ds:KeyName>
-        <ds:KeyName>ufal-point.mff.cuni.cz</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ufal-point.mff.cuni.cz,O=Charles University in Prague,C=CZ</ds:X509SubjectName>
           <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
 IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
@@ -58,38 +78,44 @@ IhAZYQU=
 </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://ufal-point.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+    <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"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LINDAT-Clarin repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository of LINDAT-Clarin project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="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:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -105,4 +131,8 @@ IhAZYQU=
     <md:SurName>Straňák</md:SurName>
     <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch.xml b/swamid-interfederations-2.0/umbrella.psi.ch.xml
index cc24c44a..a7a58f97 100644
--- a/swamid-interfederations-2.0/umbrella.psi.ch.xml
+++ b/swamid-interfederations-2.0/umbrella.psi.ch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umbrella.psi.ch/">
   <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:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-04T10:12:47Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -50,6 +50,7 @@ jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
       <ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</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="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="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>
@@ -57,6 +58,7 @@ jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
     <OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</OrganizationDisplayName>
     <OrganizationURL xml:lang="de">http://www.psi.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.psi.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Björn</GivenName>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 30ab841d..a3b0c536 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,178 +1,11 @@
 <?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://wayf.wayf.dk">
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wayf.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
-      <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ihk.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">uni-login.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frberg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ags.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nordfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">middelfart-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">opengym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">maribo-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mulerne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nakskov-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">norreg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nyborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ribekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sctknud-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">svendborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tgy.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tornbjerg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucfyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ak.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">akat.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">asg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ra.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rs.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sgy.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">stv.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">udc.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vd.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vhg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">via.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">roskilde-gym.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">greve-hym.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">himmelev-gymnasium.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kggym.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rks-gym.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">solgym.gymund.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sst.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cphwest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">akf.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bst.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ank.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosu-syd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">videndjurs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">munkensdam.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">odensekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nghf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hs-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kolding-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
-      <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>
-      <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ikgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">naestved-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">learnmark.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aabc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aalborgstudenterkursus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vuc-vs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nykat-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dalumls.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fredericia-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ghg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bggym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucvest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
-      <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mf-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">techcollege.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tradium.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucnordjylland.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">wayf.dk</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">denmark</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -199,4 +32,9 @@
     <md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 14fee192..5fa87a74 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,19 +1,73 @@
 <?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://weblicht.sfs.uni-tuebingen.de">
-  <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://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">weblicht</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>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
+      <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </mdattr:EntityAttributes>
+  </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="de">WebLicht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
 RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
 YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
@@ -44,41 +98,38 @@ YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
 +Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
 kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
 NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+wN2yHSwHNNMiiGY=
+</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://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <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: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>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">WebLicht</ServiceName>
+      <ServiceName xml:lang="en">WebLicht</ServiceName>
+      <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+      <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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="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">e60</OrganizationName>
+    <OrganizationName xml:lang="en">e60</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Thomas</GivenName>
+    <SurName>Zastrow</SurName>
+    <EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:webapplications@sfs.uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.dante.net.xml b/swamid-interfederations-2.0/weblogin.dante.net.xml
new file mode 100644
index 00000000..8ff7d09f
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin.dante.net.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin.dante.net/adfs/services/trust">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-23T14:41:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
+						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
+						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
+						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
+						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
+						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
+						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
+						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
+						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
+						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
+						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
+						2IOi
+					</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>
+						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
+						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
+						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
+						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
+						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
+						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
+						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
+						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
+						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
+						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
+						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
+						BDy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.dante.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.dante.net/adfs/ls/"/>
+    <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://weblogin.dante.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin.dante.net/adfs/ls/" index="1"/>
+  </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">
+    <GivenName>DANTE IT Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE IT</GivenName>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
index 48b067cb..5785126d 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
-  <!--
-		This is a "Shibboleth Federated Wiki" Shibboleth SP for JISC Collections and Janet Limited. 
-	-->
   <Extensions>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index 912d6501..9182934b 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,32 +1,152 @@
 <?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/entity">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-28T12:31:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <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">
+    <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" index="1"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" 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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/DS/Wayf" index="3"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/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://www.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn" index="4"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/TestShib"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/wayf-test"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/dfn-test"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/dfn-test2"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/WAYF/dfn-test" index="5"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/abu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/asc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/aru"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/asu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/bsu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/bmu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/blc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/bfc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/brc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/bru"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/bnu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/cac"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/chc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/cmj"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/cru"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/dmu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/doc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/enu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/icl"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/kiu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/lsbu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/mmu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/nec"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ncn"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/nrc"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/nou"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ntu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/qmu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/qmul"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/rgu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/rou"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ssu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/shu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/tvu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uls"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/umi"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/urhb"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uab"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uad"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ube"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ubi"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ubr"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ubri"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uco"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ucu"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ugl"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uglo"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ulo"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uma"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/unut"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uno"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/upo"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ure"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uso"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/usa"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ust"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ustr"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ute"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/ual"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uwi"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uwne"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uwtsd"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uwa"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uwe"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/uyo"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/wac"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/wel"/>
+      <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.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
+          <ds:X509Certificate>
+						MIIDUTCCAjmgAwIBAgIJANuHp/m5TCXsMA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
+						BAMTIWVtLWwxLXJoLXN2cjAxLmVtZXJhbGRpbnNpZ2h0LmNvbTAeFw0xMTA4MTEw
+						ODM1MTJaFw0yMTA4MDgwODM1MTJaMCwxKjAoBgNVBAMTIWVtLWwxLXJoLXN2cjAx
+						LmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+						ggEBAL7nJHjWMmZxHtjdwAYdXKCZwObQn8nDKWS71kULyYRgcxkVxULE+Q8sazuA
+						0bsX3Q4PQUeP6C+xuyBXzHi9XZy6Ef4hoIHo6p9qI7EboB7Qu1MebGROWca0Dtd9
+						zyadDe4y61J8BlE5euVCvbpGkHSSuFVvz0ThhTdC61vAPzvl71R5sqWxUm8xIPDT
+						0TryzRgOA0LsOH3tXsaxQ5Jb5d6G+X6+6K2flFCY8QKbrnxcMKXvTbPpMprTIa1N
+						bUT+XFONWmplOvyjHQH1GdIDQCPKc4aT3WyIA3MxnWfzpPsP8Sdi7Z+QyhXGEgOP
+						obM+cagbqe/E/Om1gUgI3a6F/z0CAwEAAaN2MHQwUwYDVR0RBEwwSoIhZW0tbDEt
+						cmgtc3ZyMDEuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL3d3dy5lbWVyYWxk
+						aW5zaWdodC5jb20vZW50aXR5MB0GA1UdDgQWBBT8iPZbLVpj12PDMabI7c5IEAQ0
+						+zANBgkqhkiG9w0BAQUFAAOCAQEAVMg4wyJ1FHeFYIuJ/zBzqPgZRD/dRQ/P64Bg
+						lkM/XKtTEkDL5nizTdMcm5qUB8sSLUpZIyuPUSy8AmYZ+FgvU6SqjW1WIhRzlnYG
+						yl3bKyl0Ji8r7We5lAhLgLnr1FTo3r9ROVd+S/BC3J7CZVE8Jcqo6AS66gTtGBja
+						xwoQYnowMJKcoCFqPkRlPL25ystxifcSpgaaRnVJMik/JHO2IwLLti+WAUj6kwCM
+						uCbrLPgzpR6W8YOkDzUH3rvANVZ5GKgqWNA/u8NfC6WRcA1Sktx2nLnK8Mw3d14g
+						MvgwMr/rwl/SPLLZ0KDGqJ8iSYjIZQKsJ/JXP9xmaeEQW6v35w==
+					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/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://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
-      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights 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:EntityDescriptor>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Emerald Live Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.emeraldinsight.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rob</GivenName>
+    <SurName>Wood</SurName>
+    <EmailAddress>mailto:rwood@emeraldinsight.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Laurence</GivenName>
+    <SurName>Parkin</SurName>
+    <EmailAddress>mailto:lparkin@emeraldinsight.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com.xml
index 3dabeb70..09b5958c 100644
--- a/swamid-interfederations-2.0/www.knodium.com.xml
+++ b/swamid-interfederations-2.0/www.knodium.com.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.knodium.com/Shibboleth.sso/Metadata">
-  <!--
-		This is a Shibboleth SP for Knodium Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-11T08:57:13Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
new file mode 100644
index 00000000..26550b5d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-12-04T15:23: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>
+  </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="de">Meertens Institute Archive</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.meertens.knaw.nl,OU=Meertens Instituut,O=KNAW,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAOmcTE0k6Yoag8eNrOUGhicwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjEyMTcwMDAwMDBaFw0xNTEyMTcyMzU5NTlaMFgxCzAJBgNV
+BAYTAk5MMQ0wCwYDVQQKEwRLTkFXMRswGQYDVQQLExJNZWVydGVucyBJbnN0aXR1
+dXQxHTAbBgNVBAMTFHd3dy5tZWVydGVucy5rbmF3Lm5sMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtqF1CkCgz6bB3dv5bTYBRCSwWqgoZActFvigdJsa
+DopFIIh+3agGBfmCI4WCb3rAluCw2LYl8mdUaRIXNDr3TkkGQP5Q+pKDHFTd1n0L
+TLs7PdTWOG61E/ExIfwTmphUvcrshazJk5xCbFBRbrWFNf/349Anf2ze1mUDBSdl
+vRTTyuYcckJKV7OHMnOh3+EsCHOkX1KsOwyhQKfmtpL7n/meIPkF9KwFocsxTjNx
+inZDHxTmikjzr6kguu5grEIeXbbA1mfO0AHVGiaXRyvNDl+EoX7IqEKJQbbIKwpd
+h1t/CHvZ/PFWdyM8K4IuDdImD3sjoYCg78yLHnR0lJJ8twIDAQABo4IBZzCCAWMw
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOPgQ/s6
+AVKL7kI1LBCGTOSGGWk0MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHd3
+dy5tZWVydGVucy5rbmF3Lm5sMA0GCSqGSIb3DQEBBQUAA4IBAQA9ZZaYfsUQ5/9d
+uqDpjUaKPkXOfyKUNllh8mInY/LE8hWp+M3L4i5iiAkFkyp+v/d07AZDR0r0F7Jp
++8hEY6HdP5+sdcTzlk6E3QezOmTAIUVcSNYLPuqyvyx0hmGZR1S4z+vYqTNyQMW1
+2L/MYOCTUdwruEmqyBR2goNyq0k6K3l5vh6TqV20E45SzpB2JEGRTIPWt46cRJNx
+wmpzyA4aXLGH97Z8DFjC2hi1bazaVr9E109r0NMXO/8yaLtc0Ok/vWHLUPB4TLCP
+HI6pYTwazmo1x3l7TmGhmhEcVc1JCN0ByVLWB+DvzXsCxYtDItsHPXj2MVPnqMJo
+GTLw7jCk
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Meertens Institute Archive</ServiceName>
+      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
+      <ServiceDescription xml:lang="de">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</ServiceDescription>
+      <ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</ServiceDescription>
+      <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="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">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>KNAW</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:servicedesk@knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
new file mode 100644
index 00000000..ec8a588e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.portal.euromonitor.com/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
+						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
+					</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>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
+						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Jurgen</GivenName>
+    <SurName>Wiehan</SurName>
+    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Jurgen</GivenName>
+    <SurName>Wiehan</SurName>
+    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2014-02-18 15:44:43 +0100
committer	Leif Johansson <leifj@sunet.se>	2014-02-18 15:44:43 +0100
commit	eb32ebf49ae662bd4cce1c1777498d68fd1f54cf (patch)
tree	4cd37c38dae0184804f8aa296d0aaba790b51491 /swamid-interfederations-2.0
parent	c9e6637865856e53df023972cccb91a13387a27a (diff)