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

author: Leif Johansson <leifj@sunet.se> 2014-04-24 15:17:18 +0200
committer: Leif Johansson <leifj@sunet.se> 2014-04-24 15:17:18 +0200
commit: 39bcf9891ec0f1600bd6ab6c5fa389ab53097a94 (patch)
tree: e4d98ba42122c0534f1ca5e3aec13c1867c8bc57 /swamid-interfederations-2.0
parent: 8e7de77a587e1f912096fd11a51b8ebcd768cf53 (diff)
121 files changed, 5360 insertions, 2534 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index d0b45d06..241c2659 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-04-28T13: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>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
-      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
+<md:EntityDescriptor 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.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+            <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    	</mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<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/Shibboleth.uem.br.xml b/swamid-interfederations-2.0/Shibboleth.uem.br.xml
index b6dec56d..4fa3f850 100644
--- a/swamid-interfederations-2.0/Shibboleth.uem.br.xml
+++ b/swamid-interfederations-2.0/Shibboleth.uem.br.xml
@@ -23,9 +23,9 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
-MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+    MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
+NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
 MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
 KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
@@ -33,12 +33,12 @@ Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
 jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
 dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
 pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAl4Dl7mjYzIGG6HNNxoEyMfbQwKatg5pBHHy2yDZqeke0TtDpxuy+/U30
-0sxxuNVqZn2APtFWY87YpycGaXog4xQDwnEZkcleIFaq/dqRQDS+S9R3tfiSTAfc
-dhx0RnXAHA+mGFDbxWtLCyJLt4eu0OOUU06MnvDBhMiPF1I6AQFTY6m6BSqupSEb
-hq6Yt/CLMLBLkEgHq9+VDZko+y9ggRF8bu3O94Nb06KlF3LHimpc937c16eGbQ/U
-/xeRwvTZLzT46YkDPvTcw5HPPoJuH5VCw15reP08xgMSPZqEeVRpUCCWe4LbKSJK
-S+QyT4Jgbp/lk64grLI49EOJ2iJo4A==
+AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
+95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
+mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
+g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
+rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
+TZVYQfUodulLy5CH0QkSH1Focl6MuA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -61,9 +61,9 @@ S+QyT4Jgbp/lk64grLI49EOJ2iJo4A==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
-MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+MIIC4jCCAcoCAQAwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTQwNDE1MTQx
+NTIwWhcNMTkwNDE0MTQxNTIwWjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
 MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
 ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
 KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
@@ -71,12 +71,12 @@ Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
 jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
 dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
 pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAl4Dl7mjYzIGG6HNNxoEyMfbQwKatg5pBHHy2yDZqeke0TtDpxuy+/U30
-0sxxuNVqZn2APtFWY87YpycGaXog4xQDwnEZkcleIFaq/dqRQDS+S9R3tfiSTAfc
-dhx0RnXAHA+mGFDbxWtLCyJLt4eu0OOUU06MnvDBhMiPF1I6AQFTY6m6BSqupSEb
-hq6Yt/CLMLBLkEgHq9+VDZko+y9ggRF8bu3O94Nb06KlF3LHimpc937c16eGbQ/U
-/xeRwvTZLzT46YkDPvTcw5HPPoJuH5VCw15reP08xgMSPZqEeVRpUCCWe4LbKSJK
-S+QyT4Jgbp/lk64grLI49EOJ2iJo4A==
+AAOCAQEApYQmpGfiWbaWLXUYvh30t5YUPqvnPcNfz70mdUhm4zIDBzHIRZeBHg2L
+95GqLFmCdQnHXcVVVADx/w1FXOQk14l3tmukOCRGHga0Ut6DPvAcJSVcTAfUh03U
+mFETv9XACNN6qWfV0f6kUWU3O64runCgTATOHFNkT+wOusx8pIIwdXudj47+KbZS
+g1si2gBE4K06TiA8DygDCIaqS7roCrsGc1iY1FWop03y91TABSH9EzU25dgAW9Q2
+rFO4M7HOkAEzzTLR7/3eE3fLOv6xTGnASwz3rYbhA/SfJZE/v/Ld6PUhBY1a+WO1
+TZVYQfUodulLy5CH0QkSH1Focl6MuA==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
index 33309cde..47af7a48 100644
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.unibe.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-idp.unibe.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-06T07:28:12Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:10:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -68,6 +68,42 @@ LxDK1XTR2ZqXgnziFQWnbI54
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
+M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
+BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
+CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
+AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
+fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
+jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
+rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
+wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
+vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
+ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
+CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
+ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
+KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
+BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
+uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
+BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
+4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
+dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
+fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
+Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
+W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -119,6 +155,42 @@ LxDK1XTR2ZqXgnziFQWnbI54
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFLjCCBBagAwIBAgIUSNx7E+uCPG6hqtUGUdmK6AYhNb4wDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDQxMTA3MzIx
+M1oXDTE2MDQxMTA3MzIxMVowgb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzAR
+BgNVBAUTCjE4MzQtMDMtMTQxCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0w
+CwYDVQQHEwRCZXJuMRowGAYDVQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UE
+AxMQYWFpLWlkcC51bmliZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOIKnhNcUtzjdGnBWU5sJGuwQyrGH8PnKmW8SOmKMeArDjc3CNwz20NzSRWL
+fkyG5Ti098dGE5skUwjGoexhqQsECn4CtlosHmQNx6DWvY5lHIzPuZEEkQssYYtN
+jIOfCy6COhce3hi80+pFDHvFYUjWmW+IMeCky60qBZlcM2HiXhh4v/Dlmt/5FgGP
+rQwZUXT5uFCICvcAVpe5NL/bjJQs69yrLu/fEfgdwLeqxYqeol+yZxJZp77mElFB
+wur4fNR1798DsiBPRT4v8Ak73YN4sxwb0ZIvGa8QI/zgrkniRjeAjrP36WmRyoxg
+vZI5ZvkkVTp8uwZuf3/RPn/4mu8CAwEAAaOCAZEwggGNMHMGCCsGAQUFBwEBBGcw
+ZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcG
+CCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
+ZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUHAgEW
+KGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwGwYDVR0R
+BBQwEoIQYWFpLWlkcC51bmliZS5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5
+uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBSCX8oNHGUSht4v58mKWfgqQaG+pTAN
+BgkqhkiG9w0BAQsFAAOCAQEAr+tBEvztLUq6sDzB/I4N4reJiWs+HXM3Nt5zPwBG
+4QmH2X/P0EfIKCKFrcAiBDYK0BBTK5LM78uZoF/rC/eRNJdFqcUxO7V2I2EOr0/g
+dBmV88orKTsK3HJ/BOxy4KGdKeDAMYli35w99xjEfRu+XbGrn8jvDWL4Z93/zbmw
+fOl8C+fbd9vbPPGMbPBYCLuj+JLIjNJVMOFZUCV3qOHPf+llHS+epzBl47oTNWsh
+Fo1fKj/jbU9y/7hE+8uhbqzr8uppWJYcLUpX49pe+YGzfaq0gjMlMh8/Pzc4DXQ7
+W2X26PAcxR9Ni6k2VcPdwrF+wSz0jKwCrJzugJ1Z99ABWA==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de.xml b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
index 4ad28ca9..23e49ff7 100644
--- a/swamid-interfederations-2.0/aai-integration.dfn.de.xml
+++ b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
@@ -23,27 +23,27 @@
         <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
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
-NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
+NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
 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
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
+cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
+F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
+gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
+iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
+KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
+GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
+gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
+2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
+ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
+E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
+Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
 MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
 AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
 MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
 dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
 LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
@@ -53,12 +53,12 @@ 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==
+dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
+cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
+FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
+MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
+sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
+fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -85,27 +85,27 @@ FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
         <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
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHF2OL1edpCjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
-NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
+NDU3MDlaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
 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
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwFs5WqdeU
+cYUa1Q1E+XzX41AljqcXIrkD0DNQ/80AvGDYZ5IKXs5SwlimXhkaNSW/tvqHAlMJ
+F2aZd0q2jjZBSaKd+DPOfP+tX2jg+2FMz+wGSnvP8BOnru44GRMlZr2nbJSxy6Pp
+gAliaX4xT03xJMqAT5KcdVyG6ZnOofBXDw3DJZTmHrZWw+mnxzvW1+O/ySO+E5q7
+iro+Zn40OZfQZaIDbH5qciE3XwrfMr8tZ2XJC62faGW7ZIr1vNGhAQZj3OBLYDtf
+KJP37LxBuy0zYjOMIWUudfRz9oe8GYTs4sOFpovtX+cO8hZzQtom24fph7+hJPc+
+GQArFjPwoa2QkuQQKXoZRJE3IGSRKutNkpZH4s0kwDfly1qPoMqv8EsjwGQgFe+e
+gmzEyyc4tB4AjldCxObvUjKDcUHsmoc2st2bm0+VUxmwoio4hGi0w4rW/FC9M7UH
+2hKEF9paUMeePRfxDLOG3na4ccK65RcSlYpTHizC8HU3AuQ0AzYB/Tes9Oczder/
+ah/U+b/IeJ7ADm/v1m/2p5GMlrAo78XZt6HhLmm4DKKzdiW6uxAHXv30B0houGgn
+E353AyUzBfERLXEkH3FUFYmOySRGStiUBQ1X4zYOQcvkaYruN4PPvOrHW/8H04lu
+Qfp9kynkF3ivk2RBtJFn6k8Z9g1B4kMOwwIDAQABo4ICTzCCAkswOQYDVR0gBDIw
 MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
 AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+KwYBBQUHAwEwHQYDVR0OBBYEFCVvQOYyQfLPymaCGHMtdPpSAi9aMB8GA1UdIwQY
 MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
 dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
 LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
@@ -115,12 +115,12 @@ 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==
+dDANBgkqhkiG9w0BAQsFAAOCAQEAZS3H79/HypaZdIGGU640RM1XrWC+A6iaeiJM
+cCIh7rzi++k3bbJWqZqRIxahtOJ0eyFryzc3CO1fhxIK1hRadvp/ZRxhzMH8Gzxo
+FZDU0uD4dzEHyAlo7Rl6Fvn6Zavl+6zbqr9ZNNJDnzPBD89YNCzMR1tGlhctAqE3
+MGTrIX43sYg3o/dEtE3cGV0H37Ea+vnboIvs4NWnFp9VP/iZfCft+anBrMU9VWjv
+sdBn7ycJhT+qKS+RCATDfldXmV3YUH5h5AegQBJhqoODwAR8pjVEl5p8JYMt2Gay
+fpkR3SKNxMqfBlCFiPbXwVv6m+f8qXHVN6Wp1YCP+XaP5IigLw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
index 8427576e..3eb816ec 100644
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.bfh.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.bfh.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-11-01T14:28:27Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T07:17:19Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -15,7 +15,7 @@
         <mdui:Description xml:lang="de">Berner Fachhochschule BFH</mdui:Description>
         <mdui:Description xml:lang="en">BFH - Bern University of Applied Sciences</mdui:Description>
         <mdui:Description xml:lang="fr">Haute école spécialisée bernoise BFH</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAwUlEQVR4nGNkYGBgYGDIrJ3IgAl+vD+4bfW1q1eRxZiwqIMDDkH7gEQtbW1kMRY0NRPd8iGM/F0TGRgYGJhYbV39kC1B14BQCncDrwQBJ010y4fbgwmIsOH3FwI2oIGrp/bj04Bm/K/3jw7s20OCDWyCcl4+/vg0QLyL7Gl5QycZGVlibYAAO2d3fBrwhCl2DWj+JqwBE1w4cxzOZoRQ2FMrAwMDA8PX57cWzZkK58Ji+t9vBiZWdLU/3l8/ewQtHgAvTzp9DJhgSwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gQEDgYKIhOF+gAAANRJREFUOMtj/P//PwMDAwNDVt0kCAMLUFWQPhDiaVcoKyl6AV2OiYEIcPvBU4cJ89fue/z8tQFRBkx0y4djGPj+45fgtv0n69DVsuCyNX/XRAyxizfuBRLtBXQX4AIkuUBGQoS8QIQBL0fzRqIMwGa7haHmAgNN5Q1ku+DE+esJx89dSyA6GpFpGFi8Yc/8t+8/yZMdBgwMDAzHz19LIjoaiQFMpEQjSQbgAvqayuuR+YzE5EYYcLI06A/xtCvCmhI5Odjef//xSxBXdna0NJiILR0AAN4ETpBaPLgrAAAAAElFTkSuQmCC</mdui:Logo>
         <mdui:Logo height="58" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA6CAIAAACoHEnGAAAACXBIWXMAAC4jAAAuIwF4pT92AAALDElEQVR4nO2ay28b1xWHz7w5HHLIITmkSA7JISm+H3pbduQkjoskRZuiiz6Apt0UaNF21U2XXfYf6K7Iuou0y6JNuymapA2CJHYax7LsWJYVS7JI8f1+zLOLkRVHoSRbJoW48AeCuDM858zv8F6ee+dykMvf/XEifw5OQpIGpZ17Wxs3b1+/0u+2T7T/2oJ984c/eyQ7DGc5VyCazCysICi6t7Op6/qkxU0C9HEdCJI6d+lbr73+K5I0TULQpHnshA384fgrP/gpimLjVXMGnDJhAAhEkvnlS+NTckacPmEAmL/4MmUyj0vK2YCPPBtzrM9PfXxwuNMW3tte+aoZZaIjqZmb/31/UuomwOgeFu2fC+zOTlswXpWe6yj/QDQ5MW0TYXQPA0C5y4/s1UNwTs9Y9UycIxNGUY3ChkZ7qFJHmRHUUzY5HZlw1rX624u/M9q//+jXR41qRRpORNfEODLh6+XcH6//xGir+pHzbbNeGb+oSXJkwrqOHJPnAYWtjbHqmThPNA9rqnr35rVxSTkbRvfwTkvoDC0nOq+vXm01quOWNFlGJ3yzkjrRs9tuvv/Pv4xbz8Q55ZAe9Lpv/emNp/HG+MiidQz1yt7f33zjqavPBqfpYbuDX778moXlxq7mDDhNwgiKRtNz3//5bzyCOG49E+f00xJttnz7R7+wu9xjVHMGjE7YbS5Nc3eMtouuxB23R5pRJvNL33kdQZBJqZsAoxNO82uXQm8b7aTr1kviv47ynxLCoVhmEsomxBOttAwSM8tPHuTMGEPCfjH2FI3qI+dh0f75L+f/AACcqV4bOI4JQZlos8XWbTfGr24CHJlwted8d+sFAMjwNxx07fgolMn0tCy6jky4LVnXKmkAcNC1ExPWNG3MuibGGH7DmqZ1WvUnj3M2jE64PbRW+879tvRFeyTlwrYiy+OXNhlGD+mrxYWrxQWjfW1v5trezDEh1q9fGb+uifGkQ7rTrN+69sFYpJwNT7bFo2lv/+1N+anauDx9wrqm/futP29v3BqjmjPgNBsAANBtN9/+65tbd9bGq+YMwGvlooOfekRrXddq5eLtT6+sffyeNBxMVNmEQEiKdk35EOTksS0NB51mvd/rAjyVDzs84xnP+L9g4flXMwsrAI96Bx9O5GbOv0Qz1odPEiQVTuQBwCOINgf/VS+PX7SPOh/PLz18aLawQjjxqNJPBRZO5Ey0ubizmZ5f4XiPqiipufOKJE1nF2jGQjOW6cx8u1FNzizrut7rNGPZhbs3rw0HveziRYpmaMYaTc80KqXZC5dNNKNrqpjIEQRpMjPR9Oyg1/WHYh5/SNd1MZEnScrm4D3+UKtRnVm+pMiyGM95/MHS7lZwOmV3uoeDvt3Bs5xLjGfLxR19AnedqNnCAiAs5/IIIbvTbbZYdzZv0xZrcfuu0+0LJ/KqItudHpIylQtbAIAgCMdPESQFgHj8IUGMffrBO6qqFrY2aLMFADbWPmE5VyCSvPXJh6FY2uH23rr2IQBsrP3XwXtxgmCsNrcvWC7sVIo7vXazWasQBOl0+5xun6EpFEujOG5h7WPPFgBQDMNRFB102/12q1zY1lRVU/eRpWG1tAsAtXLhYME8HPTv3bnBWG0m2iwNB61mLXfuRQzHZVmWpaGqqJqmKrLUrFdS8xeqpYIiy8nZZVVRNE2T5aE06DNWe6dVFyJxty8oy5KiKLquW1iOYe2KLNEWtl4pSoN+u3nCrsOTgiDIyL04BB29Jjk4/3gGCGIcHvI6WPkYGo6K+YzHRwjHbQ7exh1+ZoUgKbPlS6WYNNGzFy5/NcJ0Zv74S4STeafHf3AYy35hP52ZJynTw1v5qbkLFtuX/qY7Mb6BEI4bReR4sPTCCophCII43N5IIl/d2/X4Qhw/xXJOMZ6VpWE8v9Ru1GRp6A1GzRa2Vi7EZ5bMDGtmrNH0bKdZF8R4vVLMLj4PCHRaDdeUEE3P1kqF/PKLvC9Y3bsfimUUWcZwPJE/12pUbJxblqXM4kq/2/EGIp1WHccJl0dw8FP9bscXig4HPZZzRdKzjUpRVZREfon3BjqtuhCOC5FkvVyce+4bnWYts7Bid3p63VZ64TkURRmrrV4t5ZZekOUhx3uiqdlauaCqyqGEUcZqszvdAEAQFO8L4gTJuTxub6DbbpZ3tyLJGVVRjP4R41kExZweH00zW3fW/OH4+upVMZEDAL8YR1HM7QsCAEmZTDRDEKSu6wRJujyCmWF5byAUy1z/8J1ep221cSRJgQ68NwAAvU7LwXtpxmoyMz5xGnRw+0KR5AwCCOeaAgBJGqyvXhXCcTGes7B2xmob9vvDQX/Q7zIWNjSdubP6cSCSxHGCICiGtRMEGUnkURQz8jqccKW4c3/ztqapbn9QkYaqIvO+AGmiFVnieG+zVtZUpVLcAYBmrSz1u9VSwWS2BKdT/W47nluslws4QbYbVQRFClt3AUCWhhiGm60sPyUwVlu7WdNUpbB1t12vZhYuUrRZUWTeF9RBVxUFw3EMJ1RV6bWbDre3VaugGFrcvtuolaRhv1YpAgCCoIn8UqtebTUq9XJx0O8qigQAqqIoilwvF2O5xV6npaoqiqK1UsHtF5v1yqDfrVf2Roxp5AEohhnPP2M4bpRKDCcAACfIA1OcIAAARfctcZwAABTbb+8XWATBcQLHify5FzEMNwKiKAoAhjuCoAiCYBhuXBT2KzeKfTmOYXwQ0HDE9hsIPDStYDhhHBltBEEA9l3OlK/nH07o/MWXDy1oD0EzFrvLw/uCD33laCR13MYtAExn5nGCpEz0yE9Tc+eNdRVJmcR4dqRNOJl3TfkP/Q4jyf3rpuefiz6kQUzkMPyRtqswIZw0W6yl+/fiuSWbw6Uqciy7IEvDWGaeMtGtepXlnDYHb3e6m7VKPLfoC063GlWasbB2pyJLVhsnJrI2h0tT1enMvCINE7mlRrVkd/JWu9MbjFAU3e+23d5gp9XwCGI0NdNu1rOLz6/fuKoqspjIhRP5zc8+DSdyYjxbr+7FMnNCJFEubIcTueGg3+u2A9GUxx9qVMtG2b+3fgNFsXhuafWjdzEMzy69oCgya3fUSoXMwgpttpAkNZ2eA0BsnDMUyzTrleziRV3TnR4/7xVQzuWmTGYLywnhuEcQLSxXLmxbbFxpd8vtCx36esyMVdO1fq/j8ggW1p6cPa9pul+Mu/0hq42rlXYp2kzRZk3TWLuz12lWSwWcIHLnXlBkCQACkeTmZ6uh6XSttDvs9wDAF4yiKMpyLpbj73++7gtGLSzXrJU51/5TyYyFjaZneW/Q7QvWysVuuwkAmqZu3Pxk5dXvGdNede8+zVjtTrfD7XULosPt2978zOnxC5HE6pX/+MUYTpDeYMTKciRFowCga6oiS/1uZ/fehq7rqqLomq6qqqqpADDodQORxJQggq6rqqJpqnHJe3fWOJe71aj0u53CA0d5OAQEsTlcmqaqiuJwTe1s3g5EksaaXBoOoqnZRq1sBEFQtNdtX3n3H0I4TjNMOJFrN+sWu8MXivV7HZOZ0TVN1/V2o1bcvttp1v1izGRmAIAgKafHBwDddjMQSfLegKaq/W5bkaXi1oamqZqq6poqDQepufPtZh1BoLC10WrWpoQwYBhmlFAMx436/KD6fbG0xgnSsDkojA/eHzhi+IELQVIHBjhBOPip1NwFI86hTx+Kg+SXLxEECQALF18x5oX9mAiCYphRPnCCPFhj4wRpVHiCIA9U4ThhLKIOpBoxCZIyZgQcJ/4HcAk2YtPORt0AAAAASUVORK5CYII=</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
index 07f974ca..bc663303 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -15,7 +15,7 @@
         <mdui:DisplayName xml:lang="it">SWITCH</mdui:DisplayName>
         <mdui:Description xml:lang="de">SWITCH erbringt innovative, einzigartige Internet-Dienstleistungen für die Schweizer Hochschulen und Internetbenutzer.</mdui:Description>
         <mdui:Description xml:lang="en">SWITCH provides innovative, unique internet services for the Swiss universities and internet users.</mdui:Description>
-        <mdui:Description xml:lang="fr">SWITCH fournit des prestations innovantes et uniques pour les hautes écoles suisses et les utilisateurs d\'Internet.</mdui:Description>
+        <mdui:Description xml:lang="fr">SWITCH fournit des prestations innovantes et uniques pour les hautes écoles suisses et les utilisateurs d'Internet.</mdui:Description>
         <mdui:Description xml:lang="it">SWITCH eroga servizi Internet innovativi e unici per le scuole universitarie svizzere e per gli utenti di Internet.</mdui:Description>
         <mdui:Keywords xml:lang="en">Zurich</mdui:Keywords>
         <mdui:Keywords xml:lang="de">Zürich</mdui:Keywords>
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/cafe-gateway.ifce.edu.br.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
index 6b1153f2..3c0cb550 100644
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
@@ -15,36 +15,28 @@
         <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:InformationURL xml:lang="en">http://www.ifce.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://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=
+    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
+NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
+iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
+anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
+lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
+DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
+lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
+VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
+RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
+cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
+F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
+WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,29 +59,20 @@ YyQuuTeZTwk=
         <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=
-
+MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQw
+NDIzMTQxMTM1WhcNMTkwNDIyMTQxMTM1WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG0Ale+E+Hc6LXUIYFAyexypOGse0ZA
+iHv8A1m2SoiVpP/AuxZjHeZ8tgYB2g9wEV7sBVtRzcWPpfDnMEnwV0ycZLq1ud85
+anRUWHCXgqjgBOJPC5SNfur9b+c+z68csotN67l/4KhThVlX1bDSKsgb9sBzlHdx
+lmjPqPt4nPQG3f3eg+A+zVVoTbciDR+MM0aaoww0oFspsBxsSOzmwTO8y5SWh0Zt
+DN50/KIeZqdmLR/bNg0VIHieyKggu0df7583pofwhq/khw85kayRWOZRlK2DPqM4
+lkWYFa9hwi7SjViGte4iFBm5QyU9ROxtr1BrRruVh1gvRiQ21JEqYh0CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAgAWYi5wzaShN4+xW6GKvJB95rStAKuVBMNbvOaW+
+VvokC6np6tH3c6DmJS4Nk2ko8JvW46JKE7FDJ33yhdbg7DNFE8d9jTj1afNL99p8
+RnKzPbbDSpF86ZMV/CcGW3gKf/EpRr3M7g7Q+1bP5IBgF1wlxaP6hge0FbmKOML/
+cSsmJF5QDRLxFl+wUr9NYd05jJwNn87GVqad1+05/vnafFOk3c8k0ZD1BrCpX6eZ
+F/cL2jO5urN3UFVa2NBuec51EbyHkL8vkzLdUf3pGTP/aDDHiUofaXC1MA2+xo1o
+WKF3ut56xBKMt3NdUfAXqqOu8wRUZYIwpU2ZpT8Cn4Y7Yw==
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -105,8 +88,8 @@ YyQuuTeZTwk=
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifce.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifce.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Jessyca</SurName>
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
index 668ed7f3..d8080e3c 100644
--- a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
@@ -15,8 +15,8 @@
         <mdui:DisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:DisplayName>
         <mdui:Description xml:lang="en">IFPA - Instituto Federal do Para</mdui:Description>
         <mdui:Description xml:lang="pt-br">IFPA - Instituto Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifpa.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifpa.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ifpa.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpa.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -102,8 +102,8 @@ gX1Fk+YLQBtohJokJjO66PzCBfu3mkL+GUtOeGWI6Lc73kF6A0uSNn2HEcuE6GCh
     <OrganizationName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationName>
     <OrganizationDisplayName xml:lang="en">IFPA - Instituto Federal do Para</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifpa.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifpa.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ifpa.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifpa.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Anderson Almeida</SurName>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
index 10425468..caf05827 100644
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
@@ -27,7 +27,7 @@
 BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
 A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
 dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDMyODIwMDE0NFoXDTE3MDMyNzIwMDE0NFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
+MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
 BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
 A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
 dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
@@ -37,12 +37,12 @@ VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
 7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
 QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
 OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAHPyN6ONjhZVLcDWCV8yhJ3azms/+4AMUgszRl
-HgLJSd9sPrlyS6NqShDRsWQPP/fJOK2t/j971RtcqAQQf+4z0Q3W4Saskw+tI5mX
-GR3fYb8USesIlRttLkqbGjjERMrYiAAeACS+N/gkL52BNI7gyhW5QjgMZfT4GYcu
-obChNxbwVKTYj0btv+qUql0wbApeLQ5VSZIN9i8SxS5Sa02Lf3h93dBiXhbmXGCI
-neENgUVY7jiZjIuhAax85B4Olv229zisr7av9h3n+JB4Szcvn/uVtr8wxQV3bAWa
-VNGzsc0UMKstGfvzRQsjZB8n6dNaH384rm4cgNpCPq5xbSKU
+MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
+MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
+9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
+vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
+1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
+wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -69,7 +69,7 @@ MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
 BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
 A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
 dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
-MDMyODIwMDE0NFoXDTE3MDMyNzIwMDE0NFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
+MDQwOTE2MTkxNFoXDTE5MDQwODE2MTkxNFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
 BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
 A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
 dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
@@ -79,12 +79,12 @@ VB1lnkeAyeTd238ZVJgvHokWBdP2ykUuHN1snMNtVExME2Ie7jqUKSQrhB+8ImZV
 7AU7v76pY5Yu5AysvBL0GCBmhatWeMLpXdFJxCP6WviVeoRIBPJKYElvcH1kZn4D
 QTL8Org4tTWCsp83PkjLN/LE0xYpxQyGCx/oeUTwLt2tY/csyk5z7yLxEPxcxpj9
 OOjmpT0CU7Q6t0s846BxVNYuv2QQOwBqAhf7bWtz0EO+n8qnsVEgicLGawIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAHPyN6ONjhZVLcDWCV8yhJ3azms/+4AMUgszRl
-HgLJSd9sPrlyS6NqShDRsWQPP/fJOK2t/j971RtcqAQQf+4z0Q3W4Saskw+tI5mX
-GR3fYb8USesIlRttLkqbGjjERMrYiAAeACS+N/gkL52BNI7gyhW5QjgMZfT4GYcu
-obChNxbwVKTYj0btv+qUql0wbApeLQ5VSZIN9i8SxS5Sa02Lf3h93dBiXhbmXGCI
-neENgUVY7jiZjIuhAax85B4Olv229zisr7av9h3n+JB4Szcvn/uVtr8wxQV3bAWa
-VNGzsc0UMKstGfvzRQsjZB8n6dNaH384rm4cgNpCPq5xbSKU
+MA0GCSqGSIb3DQEBBQUAA4IBAQBJznGzZ6tpuPdLyTRk4t1o+26fAwLxRcNbjlVq
+MzlEWuUo6CJOXcFSiDDDzK47m8nG+SzSaJLbJTrBxO8MNWUzlVWlJ0sQhZzhxmGv
+9MRcUDf/1rfmrVTimpJ2mxupcFZr25Xwa/kWsjOtY50OJSJgMBY8YbpXhuQfdKS+
+vCFaVKqsdaeWU96/w8n5XdlN7qOCU9mNTFL5o1Hya0N6gE9XOFYJG+Bl9GYirlNv
+1BPl9cuCCtZpNRiW1UZXcEvyq4dwGW/1eNg/LjWQTerR/y4u0eLcJaBZDz9GDztr
+wI2yGmmso+W7sduE4zoAK9icH9XtpZV+vwVSSxqUI1yK+/pg
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
new file mode 100644
index 00000000..6b9aaafb
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifsp.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://cafe.ifsp.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">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsp.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsp.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID3DCCAsQCAQAwDQYJKoZIhvcNAQEFBQAwgbMxLzAtBgNVBAoUJklGU1AgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBTw6NvIFBhdWxvMQwwCgYDVQQLEwNESVIxIDAe
+BgkqhkiG9w0BCQEWEWluZnJhQGlmc3AuZWR1LmJyMRMwEQYDVQQHFApTw6NvIFBh
+dWxvMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQ
+Y2FmZS5pZnNwLmVkdS5icjAeFw0xNDAzMzExOTE0MjFaFw0xNzAzMzAxOTE0MjFa
+MIGzMS8wLQYDVQQKFCZJRlNQIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgU8OjbyBQ
+YXVsbzEMMAoGA1UECxMDRElSMSAwHgYJKoZIhvcNAQkBFhFpbmZyYUBpZnNwLmVk
+dS5icjETMBEGA1UEBxQKU8OjbyBQYXVsbzETMBEGA1UECBQKU8OjbyBQYXVsbzEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZzcC5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNful1zcAvMpA2Wi0sn
+Gxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1pdut7EQf+oY56pT/
+VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6FfgvIDjywdiKIoWdoVv6
+LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoGKEXx4guEptgqaIhr
+/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8GvFbyxNMBplRGQ2q5
+7TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTWYfUlAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAEB4ksViUWda7fv3ONSVUwNyLqhlQ7PN+xF6cSVtJeNV
+HusvCtoEfFDpk7vSBfsEfx5RJIzQ5gVZ47VVuN5oioivBnT3I77YPdR8+P2fuorm
+pCRUHs+J5pT2lNC+oE0JPFI30xU/2VeadJ47qcyPV3VcLseLnYo+VgAfR2nyG+2P
+9o1Qml+yve81lmURI1cqmDgWNDH8vr2Uza4QtW9IlDc/prfIa8Vredb/MQfhEBPl
+Zd+oMg2tBv4EAxBAlwOirytgK68RIiriknapuQ0sLnUygpk9bnKJveJFDLP285w+
+EFCt/Ng1JXuvzvJCeUaa/EFxI9OD5gNmfjXz295txCI=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.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.ifsp.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.ifsp.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifsp.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifsp.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>
+      
+MIID3DCCAsQCAQAwDQYJKoZIhvcNAQEFBQAwgbMxLzAtBgNVBAoUJklGU1AgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBTw6NvIFBhdWxvMQwwCgYDVQQLEwNESVIxIDAe
+BgkqhkiG9w0BCQEWEWluZnJhQGlmc3AuZWR1LmJyMRMwEQYDVQQHFApTw6NvIFBh
+dWxvMRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQ
+Y2FmZS5pZnNwLmVkdS5icjAeFw0xNDAzMzExOTE0MjFaFw0xNzAzMzAxOTE0MjFa
+MIGzMS8wLQYDVQQKFCZJRlNQIC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgU8OjbyBQ
+YXVsbzEMMAoGA1UECxMDRElSMSAwHgYJKoZIhvcNAQkBFhFpbmZyYUBpZnNwLmVk
+dS5icjETMBEGA1UEBxQKU8OjbyBQYXVsbzETMBEGA1UECBQKU8OjbyBQYXVsbzEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZzcC5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoCA9jrziW3ypnZTNful1zcAvMpA2Wi0sn
+Gxd81AffY2WeOUzn9JreTYiGfaagoi1nz6bCcq+YQUbbYOW1pdut7EQf+oY56pT/
+VNsfgvJUQ5d8QEl8tB4kvlQmffD0XGqWNF3td/QwdHD6FfgvIDjywdiKIoWdoVv6
+LhuqgfhDTKvTamE25KxD217xnSlttA1hxFoCXqGF+F2oEDoGKEXx4guEptgqaIhr
+/jPtgGVjNROmYTsbs3p0a9hm+TYAh/CkljKCx3YAm7GKLG8GvFbyxNMBplRGQ2q5
+7TUGHcE3/2KxzkL/IcTalFYwQeb6rBL8V0vhqodYF4zz0gTWYfUlAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAEB4ksViUWda7fv3ONSVUwNyLqhlQ7PN+xF6cSVtJeNV
+HusvCtoEfFDpk7vSBfsEfx5RJIzQ5gVZ47VVuN5oioivBnT3I77YPdR8+P2fuorm
+pCRUHs+J5pT2lNC+oE0JPFI30xU/2VeadJ47qcyPV3VcLseLnYo+VgAfR2nyG+2P
+9o1Qml+yve81lmURI1cqmDgWNDH8vr2Uza4QtW9IlDc/prfIa8Vredb/MQfhEBPl
+Zd+oMg2tBv4EAxBAlwOirytgK68RIiriknapuQ0sLnUygpk9bnKJveJFDLP285w+
+EFCt/Ng1JXuvzvJCeUaa/EFxI9OD5gNmfjXz295txCI=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifsp.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">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifsp.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifsp.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Paulo Orlando Ricarte Kawachi</SurName>
+    <EmailAddress>infra@ifsp.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uscs.edu.br.xml b/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
index 9235d654..d0810370 100644
--- a/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
@@ -23,29 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPTA7BgNVBAoUNFVTQ1MgLSBV
-						bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-						BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxJjAkBgkqhkiG9w0BCQEWF2luZm9y
-						bWF0aWNhQHVzY3MuZWR1LmJyMRwwGgYDVQQHFBNTw6NvIENhZXRhbm8gZG8gU3Vs
-						MRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2Fm
-						ZTAeFw0xMTEwMTAxMzA5NTFaFw0xNDEwMDkxMzA5NTFaMIHUMT0wOwYDVQQKFDRV
-						U0NTIC0gVW5pdmVyc2lkYWRlIE11bmljaXBhbCBkZSBTw6NvIENhZXRhbm8gZG8g
-						U3VsMRwwGgYDVQQLExNEZXBhcnRhbWVudG8gZGUgVElDMSYwJAYJKoZIhvcNAQkB
-						FhdpbmZvcm1hdGljYUB1c2NzLmVkdS5icjEcMBoGA1UEBxQTU8OjbyBDYWV0YW5v
-						IGRvIFN1bDETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIxDTALBgNV
-						BAMTBGNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcyCg45LWr
-						jr2yO56SQbqE6MijQ3QkvD5EWPbQtqw1Ft3GkY2aVS4Q7v+1c0xazvwFO041UX1u
-						7JNkw4pQHb5PDmqJlDnDbLoHiq4VLXMO/6NvfrVlGHD9gevXsNmph689l+giwzKv
-						w95fEa+lm9chHFFaLEVhcrpxLPGNlpsr8dqVoKFayiRptYm+a2TdFRo0UNSDubl9
-						3KyAKYy7W1dMhSpwKKAcq+MgCL1W9ShOqzWwIVP3Xow9w5Ft9z4Wls1hsz7Bbycg
-						lzBdMj3gaFaJHWMng/wl81G6xsXqhoI5l7pYchrKxE2e5TB53XSRisGMh6HT6Afp
-						au8aLT1UJu8XAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfwqCo0eryKBVy9v5am
-						4cfR+CWi7DUp7G2oHSarHSFVyLoC25SxkEv0V+V6itH9qc01AQQs66MeWjaTeUFM
-						mfmwjjAlswn2/BrV6Tujq9hWzc/mxiBLmGxIwnI26TZYPuN8iNfjRS4BY5MYO9kS
-						tTkHyAwQv6h54K0nvS9ds/Dcnao+wDNG45RNL1F4zuCQ83z5ylISQCRShsY4TSrB
-						Wxnh8bWMDO/Z0sX5H6irYr6nInxP9LwmUPhJBNXQS05pYdumgWI6duPM9bSrJrWr
-						gHPmXGan8FW+6s/8YVMACGZiK7Dl/PQ+cvTDsO+3k9F2lj8uK+fhqp+FMRHlIJgy
-						1FM=
+    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
+bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
+BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
+byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
+VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
+BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
+dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
+BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
+BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
+EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
+/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
+abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
+PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
+nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
+sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
+4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
+9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
+DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
+QEjzHAKqUpXAKTtGQ1Gp7AIE
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,29 +66,27 @@
         <ds:X509Data>
           <ds:X509Certificate>
       
-						MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPTA7BgNVBAoUNFVTQ1MgLSBV
-						bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-						BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxJjAkBgkqhkiG9w0BCQEWF2luZm9y
-						bWF0aWNhQHVzY3MuZWR1LmJyMRwwGgYDVQQHFBNTw6NvIENhZXRhbm8gZG8gU3Vs
-						MRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2Fm
-						ZTAeFw0xMTEwMTAxMzA5NTFaFw0xNDEwMDkxMzA5NTFaMIHUMT0wOwYDVQQKFDRV
-						U0NTIC0gVW5pdmVyc2lkYWRlIE11bmljaXBhbCBkZSBTw6NvIENhZXRhbm8gZG8g
-						U3VsMRwwGgYDVQQLExNEZXBhcnRhbWVudG8gZGUgVElDMSYwJAYJKoZIhvcNAQkB
-						FhdpbmZvcm1hdGljYUB1c2NzLmVkdS5icjEcMBoGA1UEBxQTU8OjbyBDYWV0YW5v
-						IGRvIFN1bDETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIxDTALBgNV
-						BAMTBGNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcyCg45LWr
-						jr2yO56SQbqE6MijQ3QkvD5EWPbQtqw1Ft3GkY2aVS4Q7v+1c0xazvwFO041UX1u
-						7JNkw4pQHb5PDmqJlDnDbLoHiq4VLXMO/6NvfrVlGHD9gevXsNmph689l+giwzKv
-						w95fEa+lm9chHFFaLEVhcrpxLPGNlpsr8dqVoKFayiRptYm+a2TdFRo0UNSDubl9
-						3KyAKYy7W1dMhSpwKKAcq+MgCL1W9ShOqzWwIVP3Xow9w5Ft9z4Wls1hsz7Bbycg
-						lzBdMj3gaFaJHWMng/wl81G6xsXqhoI5l7pYchrKxE2e5TB53XSRisGMh6HT6Afp
-						au8aLT1UJu8XAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfwqCo0eryKBVy9v5am
-						4cfR+CWi7DUp7G2oHSarHSFVyLoC25SxkEv0V+V6itH9qc01AQQs66MeWjaTeUFM
-						mfmwjjAlswn2/BrV6Tujq9hWzc/mxiBLmGxIwnI26TZYPuN8iNfjRS4BY5MYO9kS
-						tTkHyAwQv6h54K0nvS9ds/Dcnao+wDNG45RNL1F4zuCQ83z5ylISQCRShsY4TSrB
-						Wxnh8bWMDO/Z0sX5H6irYr6nInxP9LwmUPhJBNXQS05pYdumgWI6duPM9bSrJrWr
-						gHPmXGan8FW+6s/8YVMACGZiK7Dl/PQ+cvTDsO+3k9F2lj8uK+fhqp+FMRHlIJgy
-						1FM=
+MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxPTA7BgNVBAoUNFVTQ1MgLSBV
+bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
+BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNVBAcUE1PDo28gQ2FldGFu
+byBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMQ0wCwYD
+VQQDEwRjYWZlMB4XDTE0MDQyMzEyMjkwOVoXDTE5MDQyMjEyMjkwOVowgawxPTA7
+BgNVBAoUNFVTQ1MgLSBVbml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2Fl
+dGFubyBkbyBTdWwxHDAaBgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxHDAaBgNV
+BAcUE1PDo28gQ2FldGFubyBkbyBTdWwxEzARBgNVBAgUClPDo28gUGF1bG8xCzAJ
+BgNVBAYTAkJSMQ0wCwYDVQQDEwRjYWZlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnMgoOOS1q469sjuekkG6hOjIo0N0JLw+RFj20LasNRbdxpGNmlUu
+EO7/tXNMWs78BTtONVF9buyTZMOKUB2+Tw5qiZQ5w2y6B4quFS1zDv+jb361ZRhw
+/YHr17DZqYevPZfoIsMyr8PeXxGvpZvXIRxRWixFYXK6cSzxjZabK/HalaChWsok
+abWJvmtk3RUaNFDUg7m5fdysgCmMu1tXTIUqcCigHKvjIAi9VvUoTqs1sCFT916M
+PcORbfc+FpbNYbM+wW8nIJcwXTI94GhWiR1jJ4P8JfNRusbF6oaCOZe6WHIaysRN
+nuUwed10kYrBjIeh0+gH6WrvGi09VCbvFwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBEI/TESsgFK6AN0nrNrdcnqoGCf0P3yS1THvE0Q48I0RRCows+U07LTj+W4sm6
+sN9bM16I1nIwZPWSbBB49L0+JkJHkmUAId8vamN1qHG5hjU13HaIY6g2PSZNYM61
+4nL8Hf18QK/WD5etufceyiqTWImfFPq3/6bUEeZCCIcW9gnY2GjOC9a8hhWu9GV0
+9id1ZjXEhJYRnD4N42qPDTc6I9QtnbDJo5QN7+BEB7dFZ9x/WsZWk5B9Na5r69d5
+DsvS7Z5Hdoz1fHcgr6M82y0DzBOCJYFv37NBx/o8iQ/0AeWPGP75Al9b3qzAzQmS
+QEjzHAKqUpXAKTtGQ1Gp7AIE
 					
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br.xml b/swamid-interfederations-2.0/cafe01.unicamp.br.xml
index 762999c8..9118b5d6 100644
--- a/swamid-interfederations-2.0/cafe01.unicamp.br.xml
+++ b/swamid-interfederations-2.0/cafe01.unicamp.br.xml
@@ -23,24 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDLzCCAhegAwIBAgIUD0IzyHxq78QCPxPZ4hjKKmByQswwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRY2FmZTAxLnVuaWNhbXAuYnIwHhcNMTMwMTMwMTYyNDIy
-WhcNMzMwMTMwMTYyNDIyWjAcMRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyIXcS1QMWfmOCDN3RsXb6q
-sEvMJ3nVlAQDx2t6uxtugoXWc7qeGVfVy17GqfkBZeE6Nj1Trr/ZtDT4HR7r2kb0
-pvRll4Vd0xWo6vLbHL1YCLFmEbVdvkm2S8DcYeG4xnLCqMtnboiVUjNOtEVBkC76
-iTq/q2QzTgkf/pBZFzOawZJ+aOQWVguhD/N7m0DPWUfiK52ZVgujFeexjh1NBim1
-LdPfwnc+C//m6M6C6v9Y8f7ARBV6Xq5b3H/M77K/LgTMf52xLUHgGUXYjmNAu6F4
-vxbHHxXYYKF70qPNyBAlXW20sK8KFeYkLjZDu+HnHZLBuXb+1lWEqFCNyGJZm0kC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRY2FmZTAxLnVuaWNhbXAuYnKGKGh0dHBzOi8v
-Y2FmZTAxLnVuaWNhbXAuYnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFT23HRw
-Vv7kTcqFqTEp9uX8RFDNMA0GCSqGSIb3DQEBBQUAA4IBAQAQK2+kRdI8fvJnr/ar
-IWDN2qvEZzZ1stlw7RTOvh3LIjlFE15bzfIinm28RRECJ39qy5AtPijAIWrCUvv6
-Sc60kg6Tx8nziroz6ZBNcCWg6X0yc+QcsO6hUKOQU6Pz1MhVvlHXbQZR4gpJLwxT
-TwjnzdstviPxK/TW90K2szoA2FksmDnBzj+EUK9V/rAsFL/LGAZ9hMUmnGb+Dqf3
-0PLIHUFS51O6VHBHgnx4ladVSLPW+n7Gh33oAXlGdprJEhR17tL0KkLjJBgcHxsU
-7AfWicW3kJ54Qfpa/8agitOLzzV90xf/yrjd2s4HMlQufBOma3pl30Cy7HNThMO4
-PMu5
+    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
+LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
+VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
+BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
+OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
+IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
+DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
+czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
+ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
+iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
+OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
+wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
+4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
+zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
+wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
+Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
+AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
+MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
+AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
+cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
+FB2LP25VwJA=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -63,25 +67,28 @@ PMu5
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIDLzCCAhegAwIBAgIUD0IzyHxq78QCPxPZ4hjKKmByQswwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRY2FmZTAxLnVuaWNhbXAuYnIwHhcNMTMwMTMwMTYyNDIy
-WhcNMzMwMTMwMTYyNDIyWjAcMRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyIXcS1QMWfmOCDN3RsXb6q
-sEvMJ3nVlAQDx2t6uxtugoXWc7qeGVfVy17GqfkBZeE6Nj1Trr/ZtDT4HR7r2kb0
-pvRll4Vd0xWo6vLbHL1YCLFmEbVdvkm2S8DcYeG4xnLCqMtnboiVUjNOtEVBkC76
-iTq/q2QzTgkf/pBZFzOawZJ+aOQWVguhD/N7m0DPWUfiK52ZVgujFeexjh1NBim1
-LdPfwnc+C//m6M6C6v9Y8f7ARBV6Xq5b3H/M77K/LgTMf52xLUHgGUXYjmNAu6F4
-vxbHHxXYYKF70qPNyBAlXW20sK8KFeYkLjZDu+HnHZLBuXb+1lWEqFCNyGJZm0kC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRY2FmZTAxLnVuaWNhbXAuYnKGKGh0dHBzOi8v
-Y2FmZTAxLnVuaWNhbXAuYnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFT23HRw
-Vv7kTcqFqTEp9uX8RFDNMA0GCSqGSIb3DQEBBQUAA4IBAQAQK2+kRdI8fvJnr/ar
-IWDN2qvEZzZ1stlw7RTOvh3LIjlFE15bzfIinm28RRECJ39qy5AtPijAIWrCUvv6
-Sc60kg6Tx8nziroz6ZBNcCWg6X0yc+QcsO6hUKOQU6Pz1MhVvlHXbQZR4gpJLwxT
-TwjnzdstviPxK/TW90K2szoA2FksmDnBzj+EUK9V/rAsFL/LGAZ9hMUmnGb+Dqf3
-0PLIHUFS51O6VHBHgnx4ladVSLPW+n7Gh33oAXlGdprJEhR17tL0KkLjJBgcHxsU
-7AfWicW3kJ54Qfpa/8agitOLzzV90xf/yrjd2s4HMlQufBOma3pl30Cy7HNThMO4
-PMu5
-
+MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK1VOSUNBTVAg
+LSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgZGUgQ2FtcGluYXMxDjAMBgNVBAsTBUND
+VUVDMScwJQYJKoZIhvcNAQkBFhhzdXBvcnRlQGNjdWVjLnVuaWNhbXAuYnIxETAP
+BgNVBAcTCENhbXBpbmFzMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjAeFw0xNDA0MjIxNDIwNDJaFw0x
+OTA0MjExNDIwNDJaMIG/MTQwMgYDVQQKEytVTklDQU1QIC0gVW5pdmVyc2lkYWRl
+IEVzdGFkdWFsIGRlIENhbXBpbmFzMQ4wDAYDVQQLEwVDQ1VFQzEnMCUGCSqGSIb3
+DQEJARYYc3Vwb3J0ZUBjY3VlYy51bmljYW1wLmJyMREwDwYDVQQHEwhDYW1waW5h
+czESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
+ZTAxLnVuaWNhbXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCM
+iF3EtUDFn5jggzd0bF2+qrBLzCd51ZQEA8drersbboKF1nO6nhlX1ctexqn5AWXh
+OjY9U66/2bQ0+B0e69pG9Kb0ZZeFXdMVqOry2xy9WAixZhG1Xb5JtkvA3GHhuMZy
+wqjLZ26IlVIzTrRFQZAu+ok6v6tkM04JH/6QWRczmsGSfmjkFlYLoQ/ze5tAz1lH
+4iudmVYLoxXnsY4dTQYptS3T38J3Pgv/5ujOgur/WPH+wEQVel6uW9x/zO+yvy4E
+zH+dsS1B4BlF2I5jQLuheL8Wxx8V2GChe9KjzcgQJV1ttLCvChXmJC42Q7vh5x2S
+wbl2/tZVhKhQjchiWZtJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGvAZ6zGUDpF
+Uye+8JwpFrVID+b/hGg/dw1xJ2FBeqmB7/i0hs56pT+A28W6MmNARBYChfnyuVo3
+AYIQWiSQKY02JyrVyfMCNdXWjV4VEobiR/hkRVgYuzzCWb0VIB0hIKyCxZMaWqpz
+MWWaZI9IbZ56UOjaTPHEstHi5q3bsVGSx7DRY5U2itCiIzduHYpkWtUqyenCiOy0
+AUE5FIGX0MTZ2r8rF+PcfZtM3FzDUkOyokBASjD/JL8kiEeQzMKJDo5FmAvOkvKx
+cwWHnFzf8pZJSYNAlGeL3BlK59YjqH9bRHzhp+Wc4gJpzFSUuA1waEuHkUeqcYCg
+FB2LP25VwJA=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
new file mode 100644
index 00000000..bee80139
--- /dev/null
+++ b/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://colreg.de.dariah.eu/colreg">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:18:24Z">
+      <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://colreg.de.dariah.eu:443/colreg/saml/login/alias/colreg.de.dariah.eu?disco=true" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Collection Registry</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Collection Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Collection Registry</mdui:Description>
+        <mdui:Description xml:lang="en">Collection Registry</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
+MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
+JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
+9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
+P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
+PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
+tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
+2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
+g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
+C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
+8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
+8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
+NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
+H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
+n+48kUsN
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>colreg.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=colreg.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHFwXXzebkpDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAxMjcxMzA4MTRaFw0xOTAxMjYx
+MzA4MTRaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNjb2xyZWcuZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApXYpUGfB4grgZ+pP1qQR
+JKoSxfMrmmlt3F6gJuoe8vaun+GDn0j3AOhviZ+/HiasTMQv1VJ9/Zvc8rJEp/Sm
+9cYq15OoZo9LNC+kQsJo5jNpyljERgZniMN3NylNPUBiK9YPSt/oApycg1teAwif
+P0D85gmX5LtZPN4NKUa9ofEIjZARnOgNuS9uvWUiMYLRc+MUeXsbMlcijHs4rNwh
+PjQD4T1q/zX9rwcqqoqRfJQLsSRHjCXL8gFqcoA15ggis6gU1EZqm1mk7Ajb0Bpw
+tnJnfhRN/7n2CPthDUThf4lHcR84G4kchRwa/rT2RuydzW3fxTeNm9VbIqLPRrWZ
+2QIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFHEEs1fV
+g2shQl4/1DvRorTIy4bRMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE2NvbHJlZy5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQArMbCKkxkHsDeW
+C9CIVjoHqiYBNssKRbj1PECib/UkUsKYlKAyYl1UZ+BnZsyyVzXyKxXjkVgxIShX
+8ejR+rX2TAzweW5eJ9fUU+556HTTz2dLcSkv4uX5aVbd349F/3tavsyeaH8HTpiv
+8rA27qnqAih/4vbHV7WksLaLlqeCWskk8bh83NhpwEvMawuFH6CSRdJ+Ci04utIg
+NUFnuv92ZKKPuVTZNLN24s3fOiD9zotzRbDZ9p1yRVhFgCk+WK3HCMRLN0Oz60F+
+H7llf2BUo5B61cwTXmpYDfXTCTPO6x/L5lp6vnbRdeQWDVcDVXuNh4QNSzBoxAPg
+n+48kUsN
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colreg.de.dariah.eu:443/colreg/saml/SingleLogout/alias/colreg.de.dariah.eu"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Collection Registry</ServiceName>
+      <ServiceName xml:lang="en">Collection Registry</ServiceName>
+      <ServiceDescription xml:lang="de">Collection Registry</ServiceDescription>
+      <ServiceDescription xml:lang="en">Collection Registry</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>Gradl</SurName>
+    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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/de.dariah.eu.xml b/swamid-interfederations-2.0/de.dariah.eu.xml
new file mode 100644
index 00000000..634e626c
--- /dev/null
+++ b/swamid-interfederations-2.0/de.dariah.eu.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://de.dariah.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:08Z">
+      <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://de.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH DE Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH DE Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH DE Portal</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH DE Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.dariah.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dariah.eu</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9DCCBNygAwIBAgIHF2tAZ4KASTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MTQxMTEzMjdaFw0xOTA0MTMx
+MTEzMjdaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZp/ckQV5+5fVFKklNcaWwsXE1aqd7
+elspcZIWG9GFjZFXi1h9MW93AdkD23JsC2F9Go1YPkdyYJ80m5cGT6Bya7bk8Ofr
+tD8NYgqPrnVJTGOrr/u/rdtKqU7JCLp7/iP7XhahmAreLxSUYtZbfyNK9IH+Ngow
+hQTQ8CZsK/c2TQtLENN6LwBM45070Clxqzi05CyQPk9XN6pKyjfoA1uetfoIEhXE
+Qc2WE2yWaGo13bs+dRsRCYRbMofUSF3nv3BjKZ+7GqXlgY8zaI1ClzyFYWcc0VKg
+o/Xsto8RBi0mNIiG5QEacE6E9xlnd9PESmgHKzWySgJgaaF7ok55xym9AgMBAAGj
+ggJBMIICPTA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGt
+IYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUfJtiHWEOr3E4ysMy
+D3UlMdMiCuUwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswFwYDVR0R
+BBAwDoIMZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
+cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
+Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
+BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
+KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAjw9a18eRFlOY5CnWL0Dyv6iEr4JATxEM
+FhY4cwF+olbhh3FVRLIGe8DDJyeaJfXYEhWUF2TVZCG0W8Cv9Xi2bq5UNbCPzW1S
+Pw4FUAugElJ6xUAd1ENPRTI4ZxRCl2qA2ekta3ScdEq8yqyqvm1sr1AeeVTvVFUr
+IWOh5Xg8l6YkutMWCBczP0ziDxZg61X3qfZqwula8tCE9ntQIqs7Gdn41vOM5JF0
+7J1LhauZnorelWVLa9TJ0a+ZB1ksp6mSzU8miS48I16V8Hh33ZofOHEUe6IaON7h
+mE3K+QQokez7ktDhl8RWvR1efVjD76e6vIB2fItZVnP3Hxvt/ikRBw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://de.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">DARIAH DE Portal</ServiceName>
+      <ServiceName xml:lang="en">DARIAH DE Portal</ServiceName>
+      <ServiceDescription xml:lang="de">DARIAH DE Portal</ServiceDescription>
+      <ServiceDescription xml:lang="en">DARIAH DE Portal</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Bernd</GivenName>
+    <SurName>Schloer</SurName>
+    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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/dev2.dariah.eu.xml b/swamid-interfederations-2.0/dev2.dariah.eu.xml
new file mode 100644
index 00000000..a6bf222d
--- /dev/null
+++ b/swamid-interfederations-2.0/dev2.dariah.eu.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev2.dariah.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:19:21Z">
+      <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://dev2.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Dariah Wiki</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Dariah Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH-DE Wiki</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH-DE Wiki</mdui:Description>
+        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>dev2.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=dev2.dariah.eu</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIJALg01o2oofKQMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmRldjIuZGFyaWFoLmV1MB4XDTEzMDIxMjE0NDM1OFoXDTE2MDIxMjE0NDM1
+OFowGTEXMBUGA1UEAxMOZGV2Mi5kYXJpYWguZXUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDQGrDWasLQsqQfYvkQMNCjnrMgFqOkNUSxCi2M3rV4lv1H
+mu8X0p97r7dc9StkKRkKAg0cnUjKrC6fh7P19HVbbjZC0d4pNEBdP61KDLl+5SWE
+Abt5dFxvQyrgv0uoYyETTmuVU7ga/g9hwtCe8n/XxGQ75YbTAiceoFA4UAFZ5E/R
+v2dsipjmaKXXp6nEwsZMzbU16zJv8c2FwB98HYzmtbQX9HW6FbVxP4JLg7A78TJ4
+XaPCP3ashkoSKoEoWZnxqiWboOaIg+mlD/RS1CDjLDPcRoyFUzfAleKVk/Xls5v5
+FuquFS72PaeDLjnPGQArO4cDvmw7+xC3nwCccxuJAgMBAAGjXzBdMDwGA1UdEQQ1
+MDOCDmRldjIuZGFyaWFoLmV1hiFodHRwczovL2RldjIuZGFyaWFoLmV1L3NoaWJi
+b2xldGgwHQYDVR0OBBYEFFTcZ4S7fZ5cX9rFSm7UXdvBT/baMA0GCSqGSIb3DQEB
+BQUAA4IBAQCUF1SFAN8kkLjbVkoaOMsPVzf/Ygez9x/DHSiGamtzJTLm9hsYl9o+
+MDjtYXS4v/+zEh60zSK/o4MMW8kYxLBwVvvh1WgK0U/YvGY7cSGZvelFRw0vdBcZ
+RsRX2FodV49fYxgxFo6EKHDgi5rFOtA5weziXF5/gzxJkKh7xh6Qn+cZqkfIDtg2
+BA3XFSiScfM/TM8w947yxu0lcNvaUwg8sv1N5ULvmDM503WiiBcA0kxvNFH+IXUF
+MOUQT99oHyEzOEAQwHpPHesmOVyjTWpP5SVW1SAUYOSjasUlGsljGgpa3sZ6ZEcD
+hcZyahwPu8E5aiHGJpxqAthlbJ1g/YJh
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.dariah.eu/Shibboleth.sso/SAML2/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.de.dariah.eu/Shibboleth.sso/SAML2/POST" index="8"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Dariah Wiki</ServiceName>
+      <ServiceName xml:lang="en">Dariah Wiki</ServiceName>
+      <ServiceDescription xml:lang="de">DARIAH-DE Wiki</ServiceDescription>
+      <ServiceDescription xml:lang="en">DARIAH-DE Wiki</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Bernd</GivenName>
+    <SurName>Schlör</SurName>
+    <EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
index 240a7c7b..03f072ae 100644
--- a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
+++ b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
@@ -15,36 +15,30 @@
         <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:InformationURL xml:lang="en">http://www.ifrj.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrj.edu.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=
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
+NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
+AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
+iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
+qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
+El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
+U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
+Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
+byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
+nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
+4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
+H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
+ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
+9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
+w/aOYw==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +61,22 @@ gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
         <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=
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjENMAsGA1UECxMEREdUSTELMAkG
+A1UEBhMCQlIxEDAOBgNVBAMTB2RpbW9ydXMwHhcNMTQwNDA5MTcwMTQ3WhcNMTkw
+NDA4MTcwMTQ3WjAuMQ0wCwYDVQQLEwRER1RJMQswCQYDVQQGEwJCUjEQMA4GA1UE
+AxMHZGltb3J1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+zv7Fr
+iJbUyXPbTej3P+7DuIYOC/YhVThF56xHKmntH1m8Qof5ehdEe3OAxPzh9PeleDXv
+qycvCDGZK5BRJkPhb8kC0N6oJy9DMuSLFgrPVJAmdka1tuIoADCKZ3Cq2bjMmTJH
+El5bc5GLmGc3J2BYYHIOIidVDXbNb52aqO71KP2ZoohTw2tHv0KseLqAqs4N1tn6
+U90x5zPrBxH4Q/wyV9yiaAjfY+ZEt4yG79lU0bwEpMQUF4Rgeq3ix44z3YYa/sY0
+Tlw//U3AbIpbfUKFj4eTZVeo/JJzSf+yRIz7OM/seE5IGOcXy+VnEM8GMq9/sCxx
+byFREAOJlFuSuDUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlN7MaEE3P59cno17
+nLTjRIIx7+IGaaOliaLqrD9MKtfNpc9AQNxh911C9/wP7ax1H/Q9un7WdzKOSpjt
+4iDmdOUkdZYXRP7DQvPgaH+xM3D/FlfjzlGmlXFl2VBRN5PaYDr9UGIJ8MBWp5La
+H65ef+sYS/MDc3GsIJocQdeKj1gRIUrBHHdy7vPn8Mk5kxCMddrPr5qA/jaKQOcY
+ZDJp0MNni0s8IGKGWgE6NrBSRTlI+T0vhjBMaTyWu/ypieYfqx2k80H31QuruJP4
+9nhL66LJ5uOeEkGubA7gBXLLjgv98TqdIw0MvFJPjfaK0RO5TUy79N7rSpp+Bk9e
+w/aOYw==
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -104,8 +92,8 @@ gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifrj.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifrj.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Marcos Velten</SurName>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
index d5b2ab27..d6920763 100644
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.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://doccom.iml.unibe.ch/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-28T14:04:41Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-10T10:46:52Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -24,23 +24,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAIEe/2e1vVgFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTMxMjEwMTYyMjMzWhcNMTYxMjA5
-MTYyMjMzWjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzqjnux2UV9CdTXwMyRmhp4ofwxr/cdtm
-mjDZJWFLOEjZXICRIaMcQcIEToWZ0su8iIFvPAZ5sDUVgpKZ3mtRK0qENVk5zlMc
-U0S3cjFlV2+RHF8cFI0BcFgBYavTruG0YWSKQdyTE2KYcYSuLTGNNJIK+Mq9/htv
-PJ7g1ZgEhn6sIqL43pMm/mKAxTNuxjooVRkohvzGCZmoIKGk6FgkjnBwi7nDwJ7U
-aTxsdBAvqD3REOSKqT3YwGLVBnZBeMqXpkMIoyseIZk5f/c8ypQp4wzNP1eaV3NT
-Yck+cBytwhOlJxw7crgp+ah0AL0Q+Tlca38Mv0ZLDrIT97X+3G4vAQIDAQABo2kw
+MIIDKDCCAhCgAwIBAgIJAMU8stHHiSQ3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTQwNDEwMDc1NzI5WhcNMTcwNDA5
+MDc1NzI5WjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA081f+9+P/zwCwB/xPFLGYr/Olry6Ald8
+/VCcXHiO9V9OAezmSzMRfILyPLcpKZNl4rKmy3vcc67UzuJ+xA0SgzrsyqsOmxJc
+eAnPh58vkrhTooaP6JyXSV9rvrxA01m6TZMFjFJmljZ+5kmixjZ4F+zY9eBsXTXD
+utznEzh0DP1Ds6pL+eYeFezHlSSke4OhWDNVvCUSR3wE4IyImhc0afNhm7g8TOOm
+v/XavhPEw7xJBk40ivm9as/VjEe/Hu52C6McfJAUH2dyyG29jgqsFuMRDJd2zaU5
+1H+2Oxn7qLilqJ0nnbRck2RL5A2z/nOt8X4pBT6g4nBfrj+2zFA+PQIDAQABo2kw
 ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
-bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOhYMrsybcgVoGyCv
-e0LbV/g0KY4wDQYJKoZIhvcNAQEFBQADggEBALBQa19gPMqwHXd99gQGCc1GlahH
-CCuamxAQ0xXo0OpI0LM4kEmKsTA7w5HHtmRuWpX/OgnMLKG24U3dpJ+CDx9qKSQM
-KnNa9RKpoMuUYKeLegI4nf9vorPWHmvKaUX++h+MI9kdhiiwmR0nt1AW+UvhfHvF
-8kwaGHEJMO1KQGWR6D5uVrKiUUhILpkugMyR6bNrgaRSu6in8f44dx29sZ6O7foR
-/93yAZH2B9ihx76bpjpi3YkbGBqkzCtN2S0D/3u+dTAsZMC784BI93/F0/QBHYt6
-WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
+bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUIDmYnT2lN75n/KwN
+hAKm76KxX8swDQYJKoZIhvcNAQEFBQADggEBAJBf6iPfVq31qU4vL420UVjKdmMu
+lHAknUBiQgTiUsySUaAVPnPJcpzxlxKRBSd0s0/DbJQYmbCEEbGPZ6i2eLTMSocb
+kSy7D8uh0ZNtOAiTfeWc+76of+BHlXlq027rN5amd21nV4cdXmXMBuMyCidh4iNV
+zMKI709D+kxZvkCdIUlDM1TWd1v8aVViHnxNrlQ54wDFP4jRB9uDHAxUjtFfbdIL
+HpeGPZUR5zOfAiIl+zASdutD9TQVu20kr+/xSJybhXINXLj+r+x4P9xS8eYTQkLJ
+FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -80,15 +80,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/dourado.ufs.br.xml b/swamid-interfederations-2.0/dourado.ufs.br.xml
index 0e42efef..ac0f9de0 100644
--- a/swamid-interfederations-2.0/dourado.ufs.br.xml
+++ b/swamid-interfederations-2.0/dourado.ufs.br.xml
@@ -23,28 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLjAsBgNVBAoTJVVGUyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUxLzAtBgNVBAsTJkNQRCAtIENl
-bnRybyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9zMRswGQYJKoZIhvcNAQkBFgxy
-ZWRlc0B1ZnMuYnIxFjAUBgNVBAcTDVNhbyBDcmlzdG92YW8xEDAOBgNVBAgTB1Nl
-cmdpcGUxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0x
-MjEwMzAxNzI1NDFaFw0xNTEwMzAxNzI1NDFaMIHOMS4wLAYDVQQKEyVVRlMgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMS8wLQYDVQQLEyZDUEQgLSBD
-ZW50cm8gZGUgUHJvY2Vzc2FtZW50byBkZSBEYWRvczEbMBkGCSqGSIb3DQEJARYM
-cmVkZXNAdWZzLmJyMRYwFAYDVQQHEw1TYW8gQ3Jpc3RvdmFvMRAwDgYDVQQIEwdT
-ZXJnaXBlMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYX
-XauTI4yRaEuEoeyvKultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8
-zCgEmnbjZVuG01q2eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7Xkhb
-D5dA6PGtwyCu+43hVKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh
-3Gf/V01JdGgIhLlsMf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOT
-SK/QZzbOr6TVOuC08Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAGm86P1eqdEODlBQrjKLcCm+jJOpSd2k+Yvg
-NgI6oDhoJnCA34RuO7dDKIE8OoWu51NYP3I2dZn8FGo4sGOagOtkfXBzGwTaGBbM
-nqjcHZbj7cqbBbdaWA10256dNN8lB6IX8IJTGB1vu2uSx6dbC3WdOO/POlkQGiYl
-EjldMN9pv9SRV4aj25Do4wPFnb+N/qTTNlXqUzvUXtkalwG1IuGfZIZSI4RHAQyB
-DU//RrjVffnvYgV75NfL3dX7wYbS9lP5NJ3CiBQmxUH+lGDx8F/CW1cObMYXfZSa
-oAQqY3yZoERxESGkhFsV+v49S2aZ3baNM6Bt3YRPrCEUHY/lc8o=
+    MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
+byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
+Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
+CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
+MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
+VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
+dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
+VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
+KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
+eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
+VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
+Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
+8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
+YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
+aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
+JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
+d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
+ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +67,28 @@ oAQqY3yZoERxESGkhFsV+v49S2aZ3baNM6Bt3YRPrCEUHY/lc8o=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLjAsBgNVBAoTJVVGUyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUxLzAtBgNVBAsTJkNQRCAtIENl
-bnRybyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9zMRswGQYJKoZIhvcNAQkBFgxy
-ZWRlc0B1ZnMuYnIxFjAUBgNVBAcTDVNhbyBDcmlzdG92YW8xEDAOBgNVBAgTB1Nl
-cmdpcGUxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0x
-MjEwMzAxNzI1NDFaFw0xNTEwMzAxNzI1NDFaMIHOMS4wLAYDVQQKEyVVRlMgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMS8wLQYDVQQLEyZDUEQgLSBD
-ZW50cm8gZGUgUHJvY2Vzc2FtZW50byBkZSBEYWRvczEbMBkGCSqGSIb3DQEJARYM
-cmVkZXNAdWZzLmJyMRYwFAYDVQQHEw1TYW8gQ3Jpc3RvdmFvMRAwDgYDVQQIEwdT
-ZXJnaXBlMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYX
-XauTI4yRaEuEoeyvKultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8
-zCgEmnbjZVuG01q2eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7Xkhb
-D5dA6PGtwyCu+43hVKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh
-3Gf/V01JdGgIhLlsMf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOT
-SK/QZzbOr6TVOuC08Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAGm86P1eqdEODlBQrjKLcCm+jJOpSd2k+Yvg
-NgI6oDhoJnCA34RuO7dDKIE8OoWu51NYP3I2dZn8FGo4sGOagOtkfXBzGwTaGBbM
-nqjcHZbj7cqbBbdaWA10256dNN8lB6IX8IJTGB1vu2uSx6dbC3WdOO/POlkQGiYl
-EjldMN9pv9SRV4aj25Do4wPFnb+N/qTTNlXqUzvUXtkalwG1IuGfZIZSI4RHAQyB
-DU//RrjVffnvYgV75NfL3dX7wYbS9lP5NJ3CiBQmxUH+lGDx8F/CW1cObMYXfZSa
-oAQqY3yZoERxESGkhFsV+v49S2aZ3baNM6Bt3YRPrCEUHY/lc8o=
+MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxLDAqBgNVBAoTI1VGUy1Vbml2
+ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMTIwMAYDVQQLFClOVEktTsO6Y2xl
+byBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEaMBgGCSqGSIb3DQEJARYL
+Y2FmZUB1ZnMuYnIxEDAOBgNVBAcTB0FyYWNhanUxEDAOBgNVBAgTB1NlcmdpcGUx
+CzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0xNDA0MTAx
+MjMxNDFaFw0xOTA0MDkxMjMxNDFaMIHIMSwwKgYDVQQKEyNVRlMtVW5pdmVyc2lk
+YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEyMDAGA1UECxQpTlRJLU7DumNsZW8gZGUg
+VGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xGjAYBgkqhkiG9w0BCQEWC2NhZmVA
+dWZzLmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYDVQQIEwdTZXJnaXBlMQswCQYD
+VQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYXXauTI4yRaEuEoeyv
+KultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8zCgEmnbjZVuG01q2
+eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7XkhbD5dA6PGtwyCu+43h
+VKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh3Gf/V01JdGgIhLls
+Mf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOTSK/QZzbOr6TVOuC0
+8Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAH8eyp2vC7zx5oFdqWzFqZXkjGRQyih+grWeiNb3qCviPcCacyUl
+YQ2NuQEEDqManKPBPxAscO7UP1Rr9g3Ggh0vkL6KAxQqEFRwWxUkCnRd3z/TUrys
+aIt7WrF0J0mZx8qZQPasestDbSehM74s+pNsACQxY/zlbXD2Ybft9Mj62kxSdeMx
+JjjUtWoCYJwdzXAklw8r0ot7/TnVx1nNZRCV1mwFtzcKuwz8M5JDcI9sBlH+/oRd
+d6xRz2iXP9guO9SjSdWIz/LP3Px/E+ASWZ1LZBMwv8tTBmYbo9tEdUzG4DWEMwS2
+ppG+3mm7IVx2FODAFkApZmdPV4osxno36Ww=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net.xml b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
new file mode 100644
index 00000000..b907d701
--- /dev/null
+++ b/swamid-interfederations-2.0/educonf-directory.geant.net.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/metadata.php/eduCONF">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-28T14:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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:DisplayName xml:lang="en">eduCONF</mdui:DisplayName>
+        <mdui:Description xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.geant.net/service/educonf/pages/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="96" width="350" xml:lang="en">https://educonf-directory.geant.net/pic/eduCONF_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNVBAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjENMAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQwMzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMxCzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxKhy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4AHfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbHP50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJOn20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdjtqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQWBBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jHWJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3BvbHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJORDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJKzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+51Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBHAXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIECTCCAvGgAwIBAgIJAPAcrGLtMuPXMA0GCSqGSIb3DQEBBAUAMGAxCzAJBgNVBAYTAlBMMRUwEwYDVQQIEwxXaWVsa29wb2xza2ExDzANBgNVBAcTBlBvem5hbjENMAsGA1UEChMEUFNOQzELMAkGA1UECxMCTkQxDTALBgNVBAMTBFBTTkMwHhcNMTQwMzI1MTI0MTI2WhcNMjQwMzI0MTI0MTI2WjBgMQswCQYDVQQGEwJQTDEVMBMGA1UECBMMV2llbGtvcG9sc2thMQ8wDQYDVQQHEwZQb3puYW4xDTALBgNVBAoTBFBTTkMxCzAJBgNVBAsTAk5EMQ0wCwYDVQQDEwRQU05DMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAprLbGmrldyPqbXlk5Y2mE78VYdLbsn6/LtQEVO4UNuYU6kxKhy38FDjZ20Zrsgjz4fspJxP08yjeyw2qGGVcZXJRZAlJ3IRhjLlq9cZi5t5XDA4AHfD+LSzUFmllZdNRS6oOceLXRkR7BYeHVeMYQHLTc6SABjCSs9oDpGwlxj8iHqbHP50zh7PxBNxRv8PlEgsWEgGZ5Vgk1U1sT0490t7VB7ksqO+ka0BLQORPmZj7JNiJOn20X7w/fXeSTcOgRcoGhf9d5QaOU/k7yP4BPXx1fX6gPsPM63zJzvtKfD/3WCdjtqHHhEC1IP6eYzM3PJNa67N0HMiwzxpjjAPv+wIDAQABo4HFMIHCMB0GA1UdDgQWBBTzO8Ze8XJHf1jHWJ30yMxIB1BpXzCBkgYDVR0jBIGKMIGHgBTzO8Ze8XJHf1jHWJ30yMxIB1BpX6FkpGIwYDELMAkGA1UEBhMCUEwxFTATBgNVBAgTDFdpZWxrb3BvbHNrYTEPMA0GA1UEBxMGUG96bmFuMQ0wCwYDVQQKEwRQU05DMQswCQYDVQQLEwJORDENMAsGA1UEAxMEUFNOQ4IJAPAcrGLtMuPXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAEUL4IvCbJkcFE976QP/9k+zN5aXOXIIW7CSH1KJLjvCY0UJKzz+hzdaYIQ08DYq++SI+P0tUX3joUkPCQPCKiddGtRCaQLtvkl4Jt8S+eqC9rX2l+A/wry/VIjxpntaz+A+Vwz1FEiuUAHrMAchJnuCEaGXOZ9NSLErOTD6d7e2j6+51Jy2cd/WUFGtxlhkMPD4Zax1uKiJj3Ptw1Q4pBPFKNLsyObFWL2igel2fEVGxxBHAXaXuUUk8l+3BWmYoCbsZdnN36DqXqsK1NLhCCl+VIYEvr62U0B4AWlLcCfyt4Dy7eK+5ZFB6MaRVtCwdykxbQQXWNv60u8dwrbkTqk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-logout.php/eduCONF"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml2-acs.php/eduCONF" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://educonf-directory.geant.net/simplesaml/module.php/saml/sp/saml1-acs.php/eduCONF/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduCONF</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">eduCONF supports and facilitates the use and adoption of videoconferencing, simplifying the videoconference experience and reducing operational costs. It enables further integration of the NRENs’ videoconferencing services within a coherent service, reduces travel costs, environmental impact and increases the awareness of Partners’ videoconferencing services across Europe.</md:ServiceDescription>
+      <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" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GÉANT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>eduCONF</md:GivenName>
+    <md:SurName>VC team</md:SurName>
+    <md:EmailAddress>mailto:educonf@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie.xml b/swamid-interfederations-2.0/edugate.heanet.ie.xml
index c1c9be0a..faf158c4 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie.xml
@@ -130,8 +130,8 @@ The website will process your userid, name and email address to authorise access
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Edugate Resource Registry</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Edugate Resource Registry</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
index f6942f97..d3a50b79 100644
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
+++ b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
@@ -23,29 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPzA9BgNVBAoUNkVOQ0UgLSBF
-c2NvbGEgTmFjaW9uYWwgZGUgQ2nqbmNpYXMgRXN0YXTtc3RpY2FzIChJQkdFKTEP
-MA0GA1UECxMGR0VSSU5GMSIwIAYJKoZIhvcNAQkBFhNlbmNlZGxpQGliZ2UuZ292
-LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEph
-bmVpcm8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRlbmNlY2FmZS5pYmdlLmdvdi5i
-cjAeFw0xMjA0MjQxMTI1MThaFw0xNTA0MjQxMTI1MThaMIHUMT8wPQYDVQQKFDZF
-TkNFIC0gRXNjb2xhIE5hY2lvbmFsIGRlIENp6m5jaWFzIEVzdGF07XN0aWNhcyAo
-SUJHRSkxDzANBgNVBAsTBkdFUklORjEiMCAGCSqGSIb3DQEJARYTZW5jZWRsaUBp
-YmdlLmdvdi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJp
-byBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUZW5jZWNhZmUuaWJn
-ZS5nb3YuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnCgcDoU+h
-q+hYEOLks5bjZqTJTP765iNKamK/ECPFdZWEJ6+HswHaFDV5WicdgjAg1DxYuO7i
-EYZV8hofDmYuFsABKa6yE6LotmtDL+sviYA/0UePqZuiYIIyJSY4oyw41OVWMaDN
-07FUOFZOkWMfNaT4VIJ3JGdyFeAOaTbS88XbBMJD6Z6AjRZbChAFVJDH0wEKJEI4
-tGlsHIgMAKfnZdOOaDWNcUYieLQmZO1RPw5u1qHXUsQHHmCbW1Mbx/qBNcQ9GTlt
-7bO7IxOLNVuBGotX3pgUa79fXVk17TxtkVsOiOm2GC0HrQL7NZEUqiqyR4h21Qc2
-fSJ6Qhf70vLXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAG0lhKCnEhPTlJjzBosO
-zcN39DIU6TNkx7MkdI5qFgXxyEZQ5JlgOk/kZVB1rhHdujY4zpEvNX6NHGG8CYRM
-BjKhD2ePlgd040TTQDNxu143eOpUbkRuAET0ffoBA7gRsbZDpHOALZyzyDDW/duj
-MiaAf1i8aTNjk7Q1DgCmxKy3CZOP7MSoBi9b5cDq9ogi9DYdem+NUIcedH32wxGb
-hB4ZMakVi/VJ9DPq/klGUkuziY7s4QaGlVUOZlPwsZrx2vPvrshmmvZcrzX7zef/
-Gu0Wv0Dz3mK1dlQkhZpVq3KdvSbuANsFeRtAiyZ28ciKIDK3yFMl86lQ2qjZInt2
-YBk=
+    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
+U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
+EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
+cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
+SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
+HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
+RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
+BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
+Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
+IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
+Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
+4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
+Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
+Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
+iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
+E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
+F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
+/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
+3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
+ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
+y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
+xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,29 +67,28 @@ YBk=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPzA9BgNVBAoUNkVOQ0UgLSBF
-c2NvbGEgTmFjaW9uYWwgZGUgQ2nqbmNpYXMgRXN0YXTtc3RpY2FzIChJQkdFKTEP
-MA0GA1UECxMGR0VSSU5GMSIwIAYJKoZIhvcNAQkBFhNlbmNlZGxpQGliZ2UuZ292
-LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEph
-bmVpcm8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRlbmNlY2FmZS5pYmdlLmdvdi5i
-cjAeFw0xMjA0MjQxMTI1MThaFw0xNTA0MjQxMTI1MThaMIHUMT8wPQYDVQQKFDZF
-TkNFIC0gRXNjb2xhIE5hY2lvbmFsIGRlIENp6m5jaWFzIEVzdGF07XN0aWNhcyAo
-SUJHRSkxDzANBgNVBAsTBkdFUklORjEiMCAGCSqGSIb3DQEJARYTZW5jZWRsaUBp
-YmdlLmdvdi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJp
-byBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUZW5jZWNhZmUuaWJn
-ZS5nb3YuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnCgcDoU+h
-q+hYEOLks5bjZqTJTP765iNKamK/ECPFdZWEJ6+HswHaFDV5WicdgjAg1DxYuO7i
-EYZV8hofDmYuFsABKa6yE6LotmtDL+sviYA/0UePqZuiYIIyJSY4oyw41OVWMaDN
-07FUOFZOkWMfNaT4VIJ3JGdyFeAOaTbS88XbBMJD6Z6AjRZbChAFVJDH0wEKJEI4
-tGlsHIgMAKfnZdOOaDWNcUYieLQmZO1RPw5u1qHXUsQHHmCbW1Mbx/qBNcQ9GTlt
-7bO7IxOLNVuBGotX3pgUa79fXVk17TxtkVsOiOm2GC0HrQL7NZEUqiqyR4h21Qc2
-fSJ6Qhf70vLXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAG0lhKCnEhPTlJjzBosO
-zcN39DIU6TNkx7MkdI5qFgXxyEZQ5JlgOk/kZVB1rhHdujY4zpEvNX6NHGG8CYRM
-BjKhD2ePlgd040TTQDNxu143eOpUbkRuAET0ffoBA7gRsbZDpHOALZyzyDDW/duj
-MiaAf1i8aTNjk7Q1DgCmxKy3CZOP7MSoBi9b5cDq9ogi9DYdem+NUIcedH32wxGb
-hB4ZMakVi/VJ9DPq/klGUkuziY7s4QaGlVUOZlPwsZrx2vPvrshmmvZcrzX7zef/
-Gu0Wv0Dz3mK1dlQkhZpVq3KdvSbuANsFeRtAiyZ28ciKIDK3yFMl86lQ2qjZInt2
-YBk=
+MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxODA2BgNVBAoTL0VOQ0UgLSBF
+U0NPTEEgTkFDSU9OQUwgREUgQ0lFTkNJQVMgRVNUQVRJU1RJQ0FTMQ4wDAYDVQQL
+EwVDT1RFTDEoMCYGCSqGSIb3DQEJARYZc3Vwb3J0ZS5jb3RlbEBpYmdlLmdvdi5i
+cjEXMBUGA1UEBxMOUklPIERFIEpBTkVJUk8xFzAVBgNVBAgTDlJJTyBERSBKQU5F
+SVJPMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMURU5DRUNBRkUuSUJHRS5HT1YuQlIw
+HhcNMTQwNDE3MTQ1OTQzWhcNMTkwNDE2MTQ1OTQzWjCB0jE4MDYGA1UEChMvRU5D
+RSAtIEVTQ09MQSBOQUNJT05BTCBERSBDSUVOQ0lBUyBFU1RBVElTVElDQVMxDjAM
+BgNVBAsTBUNPVEVMMSgwJgYJKoZIhvcNAQkBFhlzdXBvcnRlLmNvdGVsQGliZ2Uu
+Z292LmJyMRcwFQYDVQQHEw5SSU8gREUgSkFORUlSTzEXMBUGA1UECBMOUklPIERF
+IEpBTkVJUk8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRFTkNFQ0FGRS5JQkdFLkdP
+Vi5CUjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKcKBwOhT6Gr6FgQ
+4uSzluNmpMlM/vrmI0pqYr8QI8V1lYQnr4ezAdoUNXlaJx2CMCDUPFi47uIRhlXy
+Gh8OZi4WwAEprrIToui2a0Mv6y+JgD/RR4+pm6JggjIlJjijLDjU5VYxoM3TsVQ4
+Vk6RYx81pPhUgnckZ3IV4A5pNtLzxdsEwkPpnoCNFlsKEAVUkMfTAQokQji0aWwc
+iAwAp+dl045oNY1xRiJ4tCZk7VE/Dm7WoddSxAceYJtbUxvH+oE1xD0ZOW3ts7sj
+E4s1W4Eai1femBRrv19dWTXtPG2RWw6I6bYYLQetAvs1kRSqKrJHiHbVBzZ9InpC
+F/vS8tcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC78+ABZ2uxuYLkTI3uPi5Wtc
+/HN58FWUyPq+l8/6RrSDI6/uPJ0g490/j5U3L4B4LdjSs3y9kq4sDQ44MSglLcWS
+3WeHhEDiIwWEYy8ZQkEtQfvAxXMkmEfCBaS57dwwzNNaj7CWpo8OBQrsjjboK9tM
+ohbLi2e2DPJtdWztwGYxjAl/b5f2gQVLYgAuoDFs6NEk8wqjuH3fyjs5BrHigzJD
+y/CFOm3UyxZuE6AXLTDxqEzCzdHDAtZP8tK/32zu7Kv7pCP6OI6RdVphaLOxKn7X
+xG6lNFUhNi72Kxw/UnI9yYKJzYkw2v8rC6VfbJ4UOyenQeR27aELT9w3tGOOYg==
                     
             </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/federacao.ifpi.edu.br.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
index b334a380..fc607d71 100644
--- a/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
+++ b/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
@@ -25,21 +25,21 @@
           <ds:X509Certificate>
     MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
 VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
+VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
 MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
 aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL6WD4nwp9wfYcla0witeybjoo6iz3U18b3KrL2I
-N/3TbV4OxfOsaKQmDbZVytYvkyJ91+VDtsvKG4D47+K/aohhTfFv/zdaxEkmNl1S
-SsFm/LKJ6pedhxSJBy17Nsux32Wwd/qPA/PHNd5w38oAS7N5/Jz8L1GncoQkYkmY
-WQJSb7oKX3iz01bEdE1+loIufz1Rhl2mcOGEsQMv6vebCXHfB3PePfz9wsPHYUgB
-+pP2MHK55Ickhq8TSunwwSMCn4nmfmKxTGnB6DHN2ldpHn/AKCqejt7Ujrlcln+m
-+l+26S6uJX127osxd5Z4OLmdDKnkTm2rjMYuM401U7vlmg8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAWJvSItiXe351xSBHDmgbqLT8TbfTS7ya6oyB0iYX+7HFuFId
-raR9TmrREGWAVWQnZxWfuSfWiMeQoXkbr11fBfwPoG9qGfnvSIJhMTjaZ3V9Gu1+
-0zYd+zTRCO2G6g0vwZVaZVxHAk35Exi/QhzkZGz48AxtF3ITyfg7LeSTCi4/TnGz
-dB6kCv6zmt/ZtHI98svAT09Z6RWb3gtjqNF/zAh62j88gSbpPAk4YDw1PDAXqZ2a
-UcLDw6GJMd9wJqJvZyIcnkvNhtAkNIQYGZ5OEJXU+DVi93xJREV4dSWseO4HdiZL
-EOj5nh15vIZwJttVa12rhNR/X/waxq6KDECUfA==
+AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
+ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
+uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
+vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
+LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
+CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
+YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
+twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
+NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
+ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,21 +64,21 @@ EOj5nh15vIZwJttVa12rhNR/X/waxq6KDECUfA==
       
 MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
 VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
-VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
+VQQDEwlmZWRlcmFjYW8wHhcNMTQwNDE2MTYwMzI0WhcNMTkwNDE1MTYwMzI0WjBS
 MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
 aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL6WD4nwp9wfYcla0witeybjoo6iz3U18b3KrL2I
-N/3TbV4OxfOsaKQmDbZVytYvkyJ91+VDtsvKG4D47+K/aohhTfFv/zdaxEkmNl1S
-SsFm/LKJ6pedhxSJBy17Nsux32Wwd/qPA/PHNd5w38oAS7N5/Jz8L1GncoQkYkmY
-WQJSb7oKX3iz01bEdE1+loIufz1Rhl2mcOGEsQMv6vebCXHfB3PePfz9wsPHYUgB
-+pP2MHK55Ickhq8TSunwwSMCn4nmfmKxTGnB6DHN2ldpHn/AKCqejt7Ujrlcln+m
-+l+26S6uJX127osxd5Z4OLmdDKnkTm2rjMYuM401U7vlmg8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAWJvSItiXe351xSBHDmgbqLT8TbfTS7ya6oyB0iYX+7HFuFId
-raR9TmrREGWAVWQnZxWfuSfWiMeQoXkbr11fBfwPoG9qGfnvSIJhMTjaZ3V9Gu1+
-0zYd+zTRCO2G6g0vwZVaZVxHAk35Exi/QhzkZGz48AxtF3ITyfg7LeSTCi4/TnGz
-dB6kCv6zmt/ZtHI98svAT09Z6RWb3gtjqNF/zAh62j88gSbpPAk4YDw1PDAXqZ2a
-UcLDw6GJMd9wJqJvZyIcnkvNhtAkNIQYGZ5OEJXU+DVi93xJREV4dSWseO4HdiZL
-EOj5nh15vIZwJttVa12rhNR/X/waxq6KDECUfA==
+AQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcDd/6BEQN4
+ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRnimwbbd9YZ
+uyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuyRf6HauEK
+vwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII09RGfkm+
+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7iRP+y5om
+LysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEApkUH0E14hDpfCakAsJA7Du1zmvgf1uwqJ0Db5iYgjsTuvCZD
+CkyF2tRhXFUd1IgjhT5kScN43BfOfxL+qgcgUeTRaHgxv8tdsoe5H9UIfPJ4/wgs
+YlreWAp7AwLpLUEfxuhRg0jtvd4MOklqaFq+glegAMohgGa2lTZYmTDGTR7/W9v5
+twH+A+m4zbCnd6MfzaglK4+nW2EWz7CPfvyBDcXSe1CRi6U/DAcdu2L17TBt+4Sc
+NTspSiMFvbL4XPaveBG/P2fqDs8BWYdipfJS9PajdrtOVaTSAanU7xW0TUhXd5Z2
+ESiur7i2cJdTtG/Jfbx8BA+uJa12EQx7tup6qQ==
                     
             </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/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
index d2e39a60..742b8523 100644
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
@@ -14,8 +14,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">gn-vho.grnet.gr</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">GN Virtual Home Organization (GN-VHO)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GN Virtual Home Organization (GN-VHO)</mdui:Description>
+        <mdui:DisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</mdui:Description>
+        <mdui:Description xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.noc.grnet.gr/</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
@@ -88,10 +90,11 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationName>
+    <OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.noc.grnet.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.noc.grnet.gr/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <Company>Greek Research and Technology Network</Company>
@@ -103,6 +106,5 @@
     <Company>Greek Research and Technology Network</Company>
     <EmailAddress>helpdesk@grnet.gr</EmailAddress>
     <TelephoneNumber>800-11-47638</TelephoneNumber>
-    <TelephoneNumber>+30-2109569181</TelephoneNumber>
   </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/idem.univpm.it.xml b/swamid-interfederations-2.0/idem.univpm.it.xml
new file mode 100644
index 00000000..160499f1
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.univpm.it.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+                            BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+                            DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+                            CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+                            ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+                            GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+                            bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+                            7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+                            U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+                            YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+                            dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+                            BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+                            PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+                            dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+                            Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
+                            5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
+                            ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+                            BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+                            DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+                            CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+                            ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+                            GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+                            bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+                            7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+                            U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+                            YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+                            dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+                            BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+                            PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+                            dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+                            Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
+                            5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
+                            ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.univpm.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idem-help@univpm.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
index dca95568..d70e3b88 100644
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
@@ -15,35 +15,30 @@
         <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:InformationURL xml:lang="en">http://www.ifrr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://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==
+    MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
+NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
+EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
+v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
+uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
+38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
+BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
+hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
+GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
+pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
+/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
+oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
+CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
+DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
+NMSiiw==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,28 +61,22 @@ ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
         <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==
-
+MIIC0DCCAbgCAQAwDQYJKoZIhvcNAQEFBQAwLjEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjERMA8GA1UEAxMIaWRwLWNhZmUwHhcNMTQwNDA5MTYyNzU1WhcNMTkw
+NDA4MTYyNzU1WjAuMQwwCgYDVQQLEwNEVEkxCzAJBgNVBAYTAkJSMREwDwYDVQQD
+EwhpZHAtY2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQp
+v/NepaRdzlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8H
+uCzk/nWrzEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY
+38BYCGQmuppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5Y
+BrVE/LqUB6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uw
+hvb8sOYiTgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zq
+GZMyVBZZAXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAl6toGY7toL1HPVtj
+pjGi7ed76phnITf4cHJi6Ny99tsCK29pdkWKGQ4p1F8usGy8QoWCBBLTAo/LhZye
+/AzLnW+zUV9qioGw+guncG8/GCg8SM2FR2nwUt2BXsXUodHg2kl8S8I7NbXcw9p1
+oI8OT1fkM3RcJ5F4XBErp9PI9KK5zaLGYjDgCOm4m09GmIuPbzlIBlx77B8+WZXA
+CX6Zy+sNmrpOzcg/UDotLp5yCOWlJQkcNH4U4gqCMiwbpys3zMLPjKcH+N2th9MB
+DqEeFHCPJJZZTT+MFcUMt4fMrYZ2EKfNZnLbO0cvTEmLXDTxEVU/m9n41DGtxSF0
+NMSiiw==
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -103,8 +92,8 @@ ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifrr.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Francisco Cavalcante Filho</SurName>
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
index 98f5ead2..0aaf6de9 100644
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.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-test.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
   <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>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
index de5b7cf6..66a2b8bf 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -18,6 +18,8 @@
         <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
         <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
+        <mdui:Logo height="54" width="125">https://idp.admin.grnet.gr/static/mdui_grnet_logo_125x54.png</mdui:Logo>
+        <mdui:Logo height="64" width="65">https://idp.admin.grnet.gr/static/mdui_grnet_logo_65x64.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
@@ -33,31 +35,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
-                            AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
-                            OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
-                            FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
-                            ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
-                            z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
-                            xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
-                            pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
-                            HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-                            Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-                            Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-                            Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
-                            dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
-                            L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
-                            XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
-                            gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
-                            chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
-                            ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
+                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
+                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
+                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
+                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
+                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
+                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
+                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
+                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
+                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
+                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
+                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
+                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
+                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
+                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
+                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -80,31 +74,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
-                            AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
-                            OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
-                            FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
-                            ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
-                            z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
-                            xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
-                            pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
-                            HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-                            Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-                            Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-                            Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
-                            dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
-                            L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
-                            XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
-                            gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
-                            chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
-                            ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
+                            MIIDKDCCAhCgAwIBAgIJAJzvjilzprtbMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+                            BAMTEmlkcC5hZG1pbi5ncm5ldC5ncjAeFw0xNDA0MDgxNjUyNDhaFw0xOTA0MDcx
+                            NjUyNDhaMB0xGzAZBgNVBAMTEmlkcC5hZG1pbi5ncm5ldC5ncjCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAOzRbV+pz5RuGqwAOzI4jUXUSQXHFy6IYlLr
+                            VjisR2+7ZI24GybJAstcpmmNCtFQsM1CKte1x7TFHZFfDWCVv4IVGqtx9lLw+Jhg
+                            VjV8DzX0EYVIKyJimKWwIEn2BuEKWAcTUMdGehiYVeI4sxS+FgbiJxcWiMgq4bB5
+                            QV4gBoglEbI/S1vfoBBOEdKoEUamM+MAWCR83E2+JrhMXL+BrK+ojunyq/qyoL21
+                            GLTKL8jHTUgYMidSOx0oeMzTly8LzTONRDSs6ABxgQODU+b7qgjIqoCwY/kA1mUk
+                            ziqX/eQkxhK/ycf3HMrUVSwHLyOl5SMfpKWPcPuryTTTuFczmBsCAwEAAaNrMGkw
+                            SAYDVR0RBEEwP4ISaWRwLmFkbWluLmdybmV0LmdyhilodHRwczovL2lkcC5hZG1p
+                            bi5ncm5ldC5nci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb4DIDVDxNLIg4MDr
+                            gAyL+erDTzkwDQYJKoZIhvcNAQEFBQADggEBAED8EAttcxvYdQGcE8UpuDYyMqZ1
+                            gH0fSBbs61hh/bv4NjT/2ycWik/xtdiQj5foFcDNRBDD0Z09NteURUqqwaMXZrFX
+                            0YVUlIIZ6Pi7bTFRD4Rv+uX3edLVOZekPL9H28Rkk1ndCHsFLm2cQYd9Rd+DxjS4
+                            KRtNmyH8BYTzE8YKdX173kc2gdYKTAPNpt2Vj1+ctB9OgFybzIoEKwVtGA4upU5Z
+                            9vSsXQxRZQaYacBoPMBhUgU0dY+d7cA1pAwVsMbeXqPigEnmpMHapquvrzfO/a/m
+                            WuVAvsoC7QBvZa5PSfIqJ5NAA5IfvScAfYCKRZ0xEQudPJZ0SjEo44ZsMWo=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
index f87ff55f..65637bd4 100644
--- a/swamid-interfederations-2.0/idp.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.bth.se.xml
@@ -8,6 +8,17 @@
   <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">bth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekkniska Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity provider för Blekinge Tekniska Högskola</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Blekinge Institute of Technology</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -85,9 +96,22 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
     <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Martinsson</SurName>
-    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Blekinge Institute of Technology</Company>
+    <SurName>IT Helpdesk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 381500</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
index 2e3a2ed9..f497452e 100644
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.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.cardiff.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP (running 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="2006-10-23T17:54:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
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
index e2938d0e..bdb9a1ae 100644
--- a/swamid-interfederations-2.0/idp.condorcet.be.xml
+++ b/swamid-interfederations-2.0/idp.condorcet.be.xml
@@ -1,5 +1,10 @@
 <?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">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.condorcet.be/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">condorcet.be</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index c7c70c4c..f6038339 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="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <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>
@@ -16,17 +21,13 @@
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
       </mdui:DiscoHints>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
@@ -62,27 +63,27 @@ OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
 yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </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
index 69539885..505407b5 100644
--- a/swamid-interfederations-2.0/idp.dante.net.xml
+++ b/swamid-interfederations-2.0/idp.dante.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.dante.net/idp/shibboleth">
-  <!--
-		This is a DANTE Shibboleth IdP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
index 6389209d..908633c1 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -25,36 +25,42 @@
         <ds:KeyName>idp.dfn.de</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIHFmEkcjGkZzANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
-NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
+NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
 ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK84rlbKWfWE0umBtTqYIOXPZxK5
-yCZ4Mp62I8l8Blj3vb2Zu/YPShFqfRkM6KdTAGEBaSI9n4KjMvRg8OmbgZQrHZji
-7pKFHBGDxkSj2b6Np+nv+cZne3mqOoud+AkJkJIexdKKsiu2R9r7YdtIfAvPXbxn
-AALrwVRS9U2aMiEefdLi3wPnaK1O4oPpc4RL+OkVg+E4XT9ynvX3+v7EYb7XfFlD
-CDQZK6mYi/LrOKqNYcgO+BEsSqPThnpL1OJID9AWwhvusSLH0mYlTHWUSqNmURmR
-bvaBOvjbb4FNRhAWYGCSqpvC41h2YAzr0uTaGUZxEf+U2deed7Tgq7XN0QcCAwEA
-AaOCAkMwggI/MDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMAMBEGDysGAQQB
-ga0hgiwCAQQDADAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsH29YUtAAzq1Y
-LThSQ+zcb8bhwTAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAVBgNV
-HREEDjAMggppZHAuZGZuLmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3Mt
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdz
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACvTlwnYC7H5XHT9cys+jKWbSu8h
-p07/4KCR0+wCFnMnyzPYc7buaff3MopsDkSrZWqWSFf6bDCmH3PbFE1j7wzrvUNi
-NQVzhKOUsfz/7Vv7qD4uY9NoJ6ujwOhe+fnsinZJXqaaMB4ODXjlmaqxWTtUhWdR
-yPtE6EEIWnzEnkQiBu7MsjKwQtJoohi5Yv/ia5q7dAYEux/z4C5o50gGVql+LFkS
-RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
-76UNQ60XhhXmSqN6jPetvxqRtKLzreFJjD5hQhtN8YzAk9zvzSfzweQv25I=
+A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
+sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
+pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
+eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
+ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
+p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
+YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
+J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
+6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
+UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
+BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
+NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
+giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
+53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
+cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
+BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
+BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
+luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
+2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
+dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
+XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
+t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
+OcCmF2VZ92umABiw
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -81,36 +87,42 @@ RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
         <ds:KeyName>idp.dfn.de</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=idp.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIHFmEkcjGkZzANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+          <ds:X509Certificate>MIIGmDCCBYCgAwIBAgIHF2OL3fx3djANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
 EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
-NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDA0MDgx
+NDU3MTdaFw0xODExMzAyMjAwMDBaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
 ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK84rlbKWfWE0umBtTqYIOXPZxK5
-yCZ4Mp62I8l8Blj3vb2Zu/YPShFqfRkM6KdTAGEBaSI9n4KjMvRg8OmbgZQrHZji
-7pKFHBGDxkSj2b6Np+nv+cZne3mqOoud+AkJkJIexdKKsiu2R9r7YdtIfAvPXbxn
-AALrwVRS9U2aMiEefdLi3wPnaK1O4oPpc4RL+OkVg+E4XT9ynvX3+v7EYb7XfFlD
-CDQZK6mYi/LrOKqNYcgO+BEsSqPThnpL1OJID9AWwhvusSLH0mYlTHWUSqNmURmR
-bvaBOvjbb4FNRhAWYGCSqpvC41h2YAzr0uTaGUZxEf+U2deed7Tgq7XN0QcCAwEA
-AaOCAkMwggI/MDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMAMBEGDysGAQQB
-ga0hgiwCAQQDADAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsH29YUtAAzq1Y
-LThSQ+zcb8bhwTAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAVBgNV
-HREEDjAMggppZHAuZGZuLmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3Mt
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdz
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACvTlwnYC7H5XHT9cys+jKWbSu8h
-p07/4KCR0+wCFnMnyzPYc7buaff3MopsDkSrZWqWSFf6bDCmH3PbFE1j7wzrvUNi
-NQVzhKOUsfz/7Vv7qD4uY9NoJ6ujwOhe+fnsinZJXqaaMB4ODXjlmaqxWTtUhWdR
-yPtE6EEIWnzEnkQiBu7MsjKwQtJoohi5Yv/ia5q7dAYEux/z4C5o50gGVql+LFkS
-RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
-76UNQ60XhhXmSqN6jPetvxqRtKLzreFJjD5hQhtN8YzAk9zvzSfzweQv25I=
+A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANLulBKv3/WE3HhIhXkl+u974zhl
+sQF6VLuZ90e3EDX7jD7Hbb2x9ntefY3whu8rpGKqkP4r6Au9QydnulyRTBg7ss7O
+pEy/hfoTug2QwEZEXRZZgTcxYptkoIUxyoKaZfWxe2/0IFWObSlmNx9jvY3oR1W0
+eVHDCb4FB2NVYoLNaOHLxaOF+pQZKgJnm96emX+JeC/YP9ecdtRi7ZYiFRA2uUXR
+ux0+r3zrYEVmBM7vWu1paHGvGMDpNHG7s+5a33ercMAB31G1MIcgDyXCHiWPuYlj
+p3X3OyYMkL+jGbhJ9Db3ChE9aiG93Lb4Qo5NQuCCcSJs1tz78vkCfJ7tNOBVk5KK
+YJK9i48zwg22+MicX5pPdxllRrEh0Psp6MoVdTNIq8Minyr1BrmdZB9DZBmraMXp
+J6unZoll3KWr2WTlrr43V9QMoFjKjToYEhG+2U1kWeXwK0WM8fTxuUEFvUtqNbEX
+6CAgEFoef/Jf59k2JdTvLvtZZs5DHgWKbH/VR9j8z+91nij8QmPUuBWeuWeyeirt
+UD+G07BSDS7Lebi3OnsumpGPWrxmKWEOHccgGflaRA2pQYCiW8Rv8x7adLcf0sAo
+BDCX7+737ywrDqshRDX5y75tAES6aCm/fARsZKQ4/HiOvx5vNefHElMY3w3YMUKd
+NthdnrYZeKe0WmW1AgMBAAGjggJDMIICPzA5BgNVHSAEMjAwMBEGDysGAQQBga0h
+giwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUaWmQ/Clpu7Zdjqw/7viZtheoEiQwHwYDVR0jBBgwFoAUeaJiL87xBjlS
+53ZtYsfem2p1S0kwFQYDVR0RBA4wDIIKaWRwLmRmbi5kZTCBkQYDVR0fBIGJMIGG
+MEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2Ev
+cHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8GCCsGAQUF
+BwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
+U1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBLBggr
+BgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBhogS0
+luPrkG27IJ+U533cyV407S0PPN2WbiS/i+BqVXJt0JkEz9WP3oFMg5jF3V/R0czH
+2pXqx6sVuRqXUczNCKQ7ayRkQLJJRRKvWBxTk4P3/BivbEmoszIL0m7POge3hZLe
+dH+9WswAHIDwczkPqip77o6kbrjiDeEj8epv8dNBGLnHMHoQuAntnehIb6fr+BF1
+XljtaDnOsSkkwlHPHmsIrjIyHCf5+bAOjvLs9/tOtoR5heDPM3elCSZ0U4+FfGIO
+t19h1FfeHHhQ9zC4DVuQJGVwWD5/ppoQXwA3acoFUdRnwH/ojbx8+plHuxu2Pfz8
+OcCmF2VZ92umABiw
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
index 0a96e7f9..19d446f1 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ed.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.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
   <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>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 54e38e98..ab70385e 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,325 +1,334 @@
 <?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">andebu.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">enebakk.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.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">feide.lund.kommune.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.ringerike.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">feide.verdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">fet.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">lenvik.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">met.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">ralingen.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">seljord.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">andebu.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">enebakk.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.levanger.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.lund.kommune.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.ringerike.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">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.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">lenvik.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">met.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">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">ralingen.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">seljord.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>
@@ -329,10 +338,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>
@@ -340,8 +349,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
index 138a4ae5..b9e7804b 100644
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
@@ -14,6 +14,8 @@
         <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:Logo height="40" width="40">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo_klein.jpg</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://www.fh-rosenheim.de/fileadmin/user_upload/Fakultaeten_und_Abteilungen/Rechenzentrum/Icons/fh_rosenheim_logo.jpg</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -21,37 +23,38 @@
         <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
+          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
 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
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -61,37 +64,38 @@ nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
         <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
+          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
 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
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -118,37 +122,38 @@ nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
         <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
+          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
 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
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -158,37 +163,38 @@ nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
         <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
+          <ds:X509Certificate>MIIF0DCCBLigAwIBAgIHF2RxhsjERzANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
 EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNDA0
+MDkwNzE3MTFaFw0xOTAzMTMwMDAwMDBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
 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
+AQEAwKgmaIEAqXR+2l8VZY+aoV3rzcik13hBrEsZqFqJeY7rBqc+rQ5Tk+YPeKCk
+8fX0qoZ68TqkNbeMiEztXdAGNwX5uOEP3oSoLU93TE41SUMVmU9HjBuetej33PZy
+tjslCOcApqfRZL1/ilQkkiawYegkfwWTy7jJAKzHyVAelr6TxExuusV216nhRh8t
+SOo2YA0Tr7wH3rIoXtm7rypbttdIQMn28TSAaKwd2pf7sdVbVvRliT9meEWD1A4t
+4VJwutGUcZcrxvFYXcBQY6/0/6ZLQ0mYR5yOk1Qpd0SXXhtbZZKcmF8hgQFjceG1
+YXKUgw8a6UJV21U9Deuy267k8QIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFL3z1fkYF/NmtM2ZroB49hFsL5q/MB8GA1UdIwQYMBaAFCBm
+biUvqWNNouAnuol/yxW6P66RMDoGA1UdEQQzMDGCE2lkcC5maC1yb3NlbmhlaW0u
+ZGWBGnJ6LXN1cHBvcnRAZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+
+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQ
+MIHNMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2Vy
+dmVyL09DU1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgt
+cm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAC
+hj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbPzQZcFemHgov7uQ
+gQe0OiaRLs2+kFDJGXPJSz3itUPX0Lgx1qx2DUcETDHolpKslUUZRD7L7zkjid+/
+oB+JSEowqxuosH+6xTWtok34uVLoCMAkiGD9I0Ccbxe+8q9puWJX8ZSdAN6yf0aB
+yLzKKxpLdoqvTDg3h51FAlBeA0AJnIJTJ1E2peU73xdZAJWLjSV6TMLEAu1WnCcD
+f3kIDrpEHJ90v7y1J3kXNT49/CBsKqp0SrcLo8j507TVCCBuyXBYcZP2Ixj6FyUo
+4A4ZvZgVb6Rt+2SnHFoB1ax0EG75805kZIt7qgCMGwxr0CNpxvpS2Z9q4tpmG+vh
+nflFJg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.gli.cas.cz.xml b/swamid-interfederations-2.0/idp.gli.cas.cz.xml
new file mode 100644
index 00000000..77e918d1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gli.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.gli.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  <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">gli.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Geology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Geologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider GLI AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance GLÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.gli.cas.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.gli.cas.cz/cs</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-gli-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-gli-633.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
+DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
+Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
+MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
+7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
+h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
+IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
+1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
+c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
+2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
+J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
+d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
+7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">gli.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAPMK1aN36mJ1EI8m5HvYF+VJwrIuMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5nbGkuY2FzLmN6MB4XDTE0MDMzMTEwMDk1NFoX
+DTM0MDMzMTEwMDk1NFowGTEXMBUGA1UEAxMOaWRwLmdsaS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiBF7C/8rowWkiRLwXiapiZHyrQYPB
+Cynx/NqI9law0V6tRstdj70DbZwRbzD/FssxN2Ez5FS0TmXXSqXePPW4T4+dGbsH
+MdNHmZ4qmLc/tgsiUiGvSoJKpOw8ME5906LrKyfUuulo0NTgTJFQmV3WLJWIDlZx
+7nONy10/kL1cNesTVwTzq7XrC5IJdTgiHyFjuoyVFI1x+7k4vOHWBjLm4IeyR6fX
+h50G4o+ZxgHvfvaV4fkA29yizjGhAqayNdGZwGVEvB+DG4tppKK96M/tC3U1A92b
+IH1FDFAtWuqyIboV/G8KQyIsV1nEMAarSRsdsHqb8VSBsi5vykNnzI5pAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5nbGkuY2FzLmN6hiVodHRwczovL2lkcC5nbGku
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgWOTsjiPAPp0kphbDPSR2
+1XYcQjANBgkqhkiG9w0BAQUFAAOCAQEAgy760HDnbRkAbbVNgmyuBu+1JIqKJ0Z8
+c0FHADn+b9OX7KyEI03AaxW/PDwAmhxcG7BjYB2vVfQy4UQQy+QICf52azo+9l28
+2YzkH7irI/IqcLFGLj5pQOZJSzjcMtqHUGS/7rXYdvAnurFimMCt7j5xzG+7dogB
+J8Vqj4Ls9PWUN9Vs3/FSbBI8we5AHa5Cjez+H4i+DeBMzztDZ6GWn0Lp+q6vTdRB
+d4uUiiPnJ89y7DjZYozshoLp9P3qtrNo/c/4tiEuWVb6WQxftqfj9gFM2AJ+gnV6
+7qwu6NPxIfpSmbXFNtGUcBgCSOSHBhXUOyDX8PgLlWC5IJA4hfgfOQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Geology AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Geologický ústav AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
index 5d62e2c8..1294554f 100644
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
@@ -29,36 +29,39 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
+          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
 EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
-OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
-Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
-ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
-IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
-Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
-TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
-j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
-Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
-Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
-BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
-HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
-LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
-ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
-c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
-dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
-9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
-Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
-0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
-UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
+Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
+MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
+bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
+aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
+BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
+XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
+9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
+uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
+1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
+B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
+MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
+Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
+BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
+bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
+Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
+Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
+0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
+VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
+Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
+NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
+Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -81,36 +84,39 @@ UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.hs-esslingen.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
+          <ds:X509SubjectName>CN=idp.hs-esslingen.de,OU=Rechenzentrum,O=Hochschule Esslingen,L=Esslingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHF2sVrs652TANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
 EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
-OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
-Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
-ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
-IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
-Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
-TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
-j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
-Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
-Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
-BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
-HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
-LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
-ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
-c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
-dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
-9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
-Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
-0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
-UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
+Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MDQxNDA4MTEx
+MVoXDTE3MDQxMzA4MTExMVowgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
+bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
+aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
+BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
+XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
+9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
+uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
+1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
+B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggJ6MIICdjA5BgNVHSAEMjAw
+MBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYGZ4EMAQIC
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBRfL4QHSy7M
+Ra5aBHX6NwdXgqe6yjAfBgNVHSMEGDAWgBTjWxe81iwyZTJA3U0XwDfeOk1fXDA5
+BgNVHREEMjAwghNpZHAuaHMtZXNzbGluZ2VuLmRlgRlhYWktYWRtaW5AaHMtZXNz
+bGluZ2VuLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUFBzABhidodHRw
+Oi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYIKwYBBQUHMAKG
+Pmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAkVT99Xouvdq+/4srTHpg7sICCCYio5kqAp/kZLwCSvq6
+0gn20Kx4NCWPlvFF5+EDFkvtsagvzaumW9KSeSoG9W1B47BQDwb2cWUWoWjlJ/3j
+VZvIJ8oVKW8UWs4o83fUa4jur1HncMTQTKk66FFU7i6TTTY54XLja1GhPnTy+Qf8
+Me/Op4MuO9z7u18gz/+N92UYDDj+oQ/qxqE59U8JvrmD1DfgGj6eD+aKSrNRdyDH
+NWIt36FgWB/n/nt0VSCHEC5PaGAJLzlzMg/IayNHTTAUh1DL/Arr6rP0UXNN93AU
+Z3vEPDMlRrML5nkyZvylGJJgGIr9TUNxX2xHhi+kIg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
index 29c9efea..a1660976 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch.xml
+++ b/swamid-interfederations-2.0/idp.hslu.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://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:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:20:55Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -92,6 +92,31 @@ OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
+FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
+87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
+RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
+aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
+68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
+RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
+lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
+s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
+eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
+dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
+IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
+7uYGZFS62PnJbFAk9NvN1g==
+						</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
@@ -167,6 +192,31 @@ OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAOIyvPYAinGuMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC2lkcC5oc2x1LmNoMB4XDTE0MDQxMTA4MTM1MVoXDTE3MDQxMDA4MTM1MVow
+FjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwhrP8yk/+IifeO8mUL2SPCX2Jwze6fiyBxaLFsq9PRUKwu/m6CMk9
+87SAvBV541a0pWRpizrAa/jSRNPXQYQLK9h93/5bTc4VBbf1PfqnluOIAq7y23bG
+RQEkcd7NqOkTMOl404LIys0lsk6yQz/GILg6howVh77wGG07AL8DlBFhyjMaOHTt
+aNHh5Chkk8mEB7EP92uJpB6vISJV/Adj2Y95ZefwWo09vGWlUP1usJr0Rhn2HpYy
+68Q0tKY5vXQYIf2IDyoCmPVXW+Q5GWL/WWc/ZUfmi5Srrueh/DRNzoT4/6tqt39r
+RfiVjjhml9p2w4NPwchEYKkec5/ThxIzAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
+cC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBRclnGUQ4woRbzyaXdRPmu0afzYDDANBgkqhkiG9w0BAQUFAAOCAQEA
+lxSpDW+8n4O9+VGRxrqir42UFerXSYKlr5TiCzU2vpgUOuecK05hrskCeCrn1Zr+
+s4zkISefcaXayNOVhCOfUEfc/eA3VlefzSTfXk84pGkhIDJ4DTDMlkP1MCQNDYcx
+eMTbruMyKU4AYHbQgvhAqXUuMD6dXqtmkKatWTyWw9jNYjsNi18CCPN0UIq2lqoM
+dKuYJ6IAhWZYLq/vqC4kllYX2rhXxu/F/1A92qfG4FhE9urOu+LVd6LdO2WSwj/N
+IwOpfglNU30kw1y3t08Pwq1wZEmNW+5PUjDbUrGLvnPaLRjjXoXVebzPXoqaGJm0
+7uYGZFS62PnJbFAk9NvN1g==
+						</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
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.ifal.edu.br.xml b/swamid-interfederations-2.0/idp.ifal.edu.br.xml
index b5cfec63..832b9f63 100644
--- a/swamid-interfederations-2.0/idp.ifal.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifal.edu.br.xml
@@ -23,21 +23,28 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTEzMTExODE5MjI1OVoXDTE4MTExNzE5
-MjI1OVowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGEje2UFUdN1HzSRBsXM
-hixluIlm5hjLoZ7murfl+hzIVNmBZggf51Spj2i2axnbaKZBcTvb7wq/ZB0T5ecU
-VU9tMliIkokFbBWWHO+hTkt408IGABNPpcLf+DfupbEkkg9SQciPDw0fxN7+FBRA
-5if0qT0KPdzlmJVDcqPS7BRhWCfPFOBF/E4Pi5j6b4z+wCsLjqVLclfDHb/e8R8V
-b0OnodoYYm4mkt4f2D4cqgT5+674jP/81Mef63IwAXZXC0Zp4LrlxfxQp1lh8yTb
-8YpBI6QA2cOCPcwPmjK/3CRJH568hBs0ay0c3zHRWuGz9/zBEGJiHYQyHo/fiu5m
-WQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBr10bEQEAyP792qjUSjytDoFqmZMJ6
-YkMQEsd8s153kQLj1NbznzJjwkfZv8aQ0164t1MvBUL6zqav6EyXCydW5RB1I9vv
-ruM9WKzcZLpi4RlvOn0YCR77zwmAMXUNsoeYfELx/yv4IZpT1STux9cke5bkgNZ9
-EZY8zZwPb8K5u7JQ1If4/ZY+eGGpyytbQb8NbaaHcQZN9UHzpyzRSOykJrGesTvb
-IC7sKOtE3w/J385jW6Iy85iF0W5yKYceivIBdz4Hfcy3sBSHY6o+DDGPDsOFdjbd
-lus9J9qu2AFSjFGy7nXL2y2ySANpwFegTOF9sggED8BBKArvWBgrLOJ9
+    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
+dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
+CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
+QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
+Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
+hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
+BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
+xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
+5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
+FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
+HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
+JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
+7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
+B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
+TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
+vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
+GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
+9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -60,21 +67,28 @@ lus9J9qu2AFSjFGy7nXL2y2ySANpwFegTOF9sggED8BBKArvWBgrLOJ9
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTEzMTExODE5MjI1OVoXDTE4MTExNzE5
-MjI1OVowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGEje2UFUdN1HzSRBsXM
-hixluIlm5hjLoZ7murfl+hzIVNmBZggf51Spj2i2axnbaKZBcTvb7wq/ZB0T5ecU
-VU9tMliIkokFbBWWHO+hTkt408IGABNPpcLf+DfupbEkkg9SQciPDw0fxN7+FBRA
-5if0qT0KPdzlmJVDcqPS7BRhWCfPFOBF/E4Pi5j6b4z+wCsLjqVLclfDHb/e8R8V
-b0OnodoYYm4mkt4f2D4cqgT5+674jP/81Mef63IwAXZXC0Zp4LrlxfxQp1lh8yTb
-8YpBI6QA2cOCPcwPmjK/3CRJH568hBs0ay0c3zHRWuGz9/zBEGJiHYQyHo/fiu5m
-WQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBr10bEQEAyP792qjUSjytDoFqmZMJ6
-YkMQEsd8s153kQLj1NbznzJjwkfZv8aQ0164t1MvBUL6zqav6EyXCydW5RB1I9vv
-ruM9WKzcZLpi4RlvOn0YCR77zwmAMXUNsoeYfELx/yv4IZpT1STux9cke5bkgNZ9
-EZY8zZwPb8K5u7JQ1If4/ZY+eGGpyytbQb8NbaaHcQZN9UHzpyzRSOykJrGesTvb
-IC7sKOtE3w/J385jW6Iy85iF0W5yKYceivIBdz4Hfcy3sBSHY6o+DDGPDsOFdjbd
-lus9J9qu2AFSjFGy7nXL2y2ySANpwFegTOF9sggED8BBKArvWBgrLOJ9
+MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExLDAqBgNVBAoTI0lGQUwgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMTYwNAYDVQQLFC1EVEkgLSBEaXJl
+dG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHjAcBgkqhkiG9w0B
+CQEWD2R0aUBpZmFsLmVkdS5icjEQMA4GA1UEBxQHTWFjZWnDszEQMA4GA1UECBMH
+QWxhZ29hczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjAe
+Fw0xNDA0MDkxNzUwMDdaFw0xOTA0MDgxNzUwMDdaMIHRMSwwKgYDVQQKEyNJRkFM
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgZGUgQWxhZ29hczE2MDQGA1UECxQtRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMR4wHAYJKoZI
+hvcNAQkBFg9kdGlAaWZhbC5lZHUuYnIxEDAOBgNVBAcUB01hY2Vpw7MxEDAOBgNV
+BAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZhbC5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMYSN7ZQVR03UfNJEG
+xcyGLGW4iWbmGMuhnua6t+X6HMhU2YFmCB/nVKmPaLZrGdtopkFxO9vvCr9kHRPl
+5xRVT20yWIiSiQVsFZYc76FOS3jTwgYAE0+lwt/4N+6lsSSSD1JByI8PDR/E3v4U
+FEDmJ/SpPQo93OWYlUNyo9LsFGFYJ88U4EX8Tg+LmPpvjP7AKwuOpUtyV8Mdv97x
+HxVvQ6eh2hhibiaS3h/YPhyqBPn7rviM//zUx5/rcjABdlcLRmnguuXF/FCnWWHz
+JNvxikEjpADZw4I9zA+aMr/cJEkfnryEGzRrLRzfMdFa4bP3/MEQYmIdhDIej9+K
+7mZZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADYaFXfiCJtLtww2Qwwanyg4qUT2
+B2oYluc4YiHrGNT+ZAsr9g94gumyDyZ+XbZWHhWrrLCfw9qe3h0CrRUDo8imO+sE
+TYGq7XpOcAJWyKQVgcDICWiL6zQENRX/EeOfmOpbkjea/MEaqK0nyRQlaA4pIXYL
+vSvRPNaw93HsFLdGrJOQ0iZIp3wXB/th8NcGeLYC2DVXWfyL+3dTsCusEatFrkWO
+GYTYC2CuhPvNQnW6zntOBvF5+m8u3UE5S7b1ewJNR+bmnyRc5Jn3c+hDby241MxP
+9absP8SAHft1nylCyQlyRb7eDLMdi+iNITGXEKHAyXu20TXapcllySccxOk=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br.xml b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
index 18e5cdfc..6eae8191 100644
--- a/swamid-interfederations-2.0/idp.ifap.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
@@ -15,35 +15,29 @@
         <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:InformationURL xml:lang="en">http://www.ifap.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://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
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDE2MTEyOFoXDTE5MDQwOTE2
+MTEyOFowKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgL
+W0fGHYgMHSqS2gQqaTW2KfAoe6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEq
+MC1Eu9lLlStVvUjqp23DLdwIKzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB7
+7i9FpJ8kZgky9iZhHCsBp9AdQVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dB
+ItnNx6Z8YCEcBA+IzOL38By8MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+n
+Z/GLwXx5rkbaB8wQZen2v0q+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1D
+gwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQDJ9GGFu1uP2xSjX0bEPb/jhKOKU9VD
+LH2vSu9V0zbkH9/uxgGLfOHuP+83QyDLfxEJKa1Ga4Hw+y6o7vyn3mW0RXBBloF/
+GTeDI2aFAmuPNomYl+ijCxk37ur/iQ3ugo0PbvVSZV9hxic8FJbBjGg7ZvyMXwuZ
+1nQfeXL+1qESFEwm5ClCR9G/WNmhaxr1bYanl9uvCS4tmpKJ1zZthDpnCRYLoIdx
+HTc3JBOzycaHMO08/JyQND4i4t4OuiY6iemEsTuGgC2aeOZYRJ9qCyjVnFMQE8lV
+arZrEBblthd0n3nlykz5YYjwsNa9rkr6Yo9NDXv3iorY6fD2Rk8z8JB2
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -103,8 +97,8 @@ BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifap.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Marco Pantoja</SurName>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br.xml b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
index 9590a99e..ad72b357 100644
--- a/swamid-interfederations-2.0/idp.ifc.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
@@ -15,35 +15,29 @@
         <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
         <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
         <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
-        <mdui:InformationURL xml:lang="en">www.ifc.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifc.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.ifc.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifc.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xLDAqBgNVBAoTI0lGQyAtIElu
-c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHzAdBgkq
-hkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAPBgNVBAcTCEJsdW1lbmF1MRcw
-FQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmlk
-cC5pZmMuZWR1LmJyMB4XDTE0MDMxNDE0NTE0NVoXDTE3MDMxMzE0NTE0NVowga8x
-LDAqBgNVBAoTI0lGQyAtIEluc3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQww
-CgYDVQQLEwNEVEkxHzAdBgkqhkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAP
-BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
-BhMCQlIxFzAVBgNVBAMTDmlkcC5pZmMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraUtsB76JjKzQtx6QfkHSiDx5uw
-HTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GAzcBTuJskMbFFXOnfi33F8jBJ
-TodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqjeXOCrAzZEfBwdsxallOhle6m
-qr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u0NiRhgaT9E9WMj/wKrDVzs0r
-YkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Ylsu8G7kTdGyS0/CyABr9+FL8
-XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7ywIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQADX2xQkHlVaFQNGF/3ZpeGSPmoDqexhp8zqVewea3xibHGfeAZA3Ba
-jWkgmkP2N09lP2xxipxO2cZeWfUPxLI0caC/r5FTp/U+JrzXoGprC1Tw0bDonimG
-RToY9MOcPIoQcgScYTLo7ZhoTa2OXXUXF/0XL00uWDr5Emk+IJvhj1C4xovXabNK
-IHzmG/AQ06/CyfBK2jxo3JFucNnVxrL+1zKhMu11wxEsOoT3sBFNhkfzLngExNbs
-7x6/mPYJnJ8Vemd76Oui5ISEF8A3tfS0LjanFNz1I9kH9H9T/dESjgqcTWtw8ET/
-ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
+MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
+tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
+zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
+eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
+0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
+lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
+ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
+RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
+X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
+REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
+3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
+xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,28 +60,21 @@ ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xLDAqBgNVBAoTI0lGQyAtIElu
-c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHzAdBgkq
-hkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAPBgNVBAcTCEJsdW1lbmF1MRcw
-FQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmlk
-cC5pZmMuZWR1LmJyMB4XDTE0MDMxNDE0NTE0NVoXDTE3MDMxMzE0NTE0NVowga8x
-LDAqBgNVBAoTI0lGQyAtIEluc3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQww
-CgYDVQQLEwNEVEkxHzAdBgkqhkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAP
-BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
-BhMCQlIxFzAVBgNVBAMTDmlkcC5pZmMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraUtsB76JjKzQtx6QfkHSiDx5uw
-HTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GAzcBTuJskMbFFXOnfi33F8jBJ
-TodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqjeXOCrAzZEfBwdsxallOhle6m
-qr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u0NiRhgaT9E9WMj/wKrDVzs0r
-YkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Ylsu8G7kTdGyS0/CyABr9+FL8
-XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7ywIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQADX2xQkHlVaFQNGF/3ZpeGSPmoDqexhp8zqVewea3xibHGfeAZA3Ba
-jWkgmkP2N09lP2xxipxO2cZeWfUPxLI0caC/r5FTp/U+JrzXoGprC1Tw0bDonimG
-RToY9MOcPIoQcgScYTLo7ZhoTa2OXXUXF/0XL00uWDr5Emk+IJvhj1C4xovXabNK
-IHzmG/AQ06/CyfBK2jxo3JFucNnVxrL+1zKhMu11wxEsOoT3sBFNhkfzLngExNbs
-7x6/mPYJnJ8Vemd76Oui5ISEF8A3tfS0LjanFNz1I9kH9H9T/dESjgqcTWtw8ET/
-ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
-
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDRFRJMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQwOTE3MzAyN1oXDTE5MDQwODE3
+MzAyN1owKTEMMAoGA1UECxMDRFRJMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraU
+tsB76JjKzQtx6QfkHSiDx5uwHTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GA
+zcBTuJskMbFFXOnfi33F8jBJTodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqj
+eXOCrAzZEfBwdsxallOhle6mqr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u
+0NiRhgaT9E9WMj/wKrDVzs0rYkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Y
+lsu8G7kTdGyS0/CyABr9+FL8XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7
+ywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCwZr/7KyPjp03yXWWifSpXVOZMWb0k
+RoJyA5upb4YWilPJGH/B5frSuXnzaAY7vSFEGKqjzk2JcpH5hv2M0wLWBYXZgp3c
+X6t16xJB7M0Ob5mOFz7Z0toxyuNHm8egrKjdhUS9od67QempObje5TRgwk8szHhv
+REBeVYn9VTnMBpHvTzVXUqWzvVaULHwo9207emUQPljqP8whQkpMzjp49OsD75ua
+3ejIxW0axzH47H9klC86IALnAXv+Ad5sh41ZHuBX6zz7N/Cenu/W9SFDJ5x1IIsw
+xLSEYO4XtQH/sy1ouM4VkghXlqRSeKDOgynu35E6pd2ZtyqDIjWQlpxk
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -103,8 +90,8 @@ ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
     <OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationName>
     <OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.ifc.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifc.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ifc.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Renato de Souza Muniz</SurName>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
index 5ae2df2d..5aeaf5e1 100644
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
@@ -15,8 +15,8 @@
         <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:InformationURL xml:lang="en">http://www.ifpb.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpb.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -27,8 +27,8 @@
 bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
 hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
 Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
-NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
+MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
 cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
 bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
 UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
@@ -38,12 +38,12 @@ NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
 8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
 lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
 I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
-LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
-ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
-feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
-SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
-Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
+GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
+vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
+aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
+tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
+kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -70,8 +70,8 @@ MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
 bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
 hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
 Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
-NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwNDIzMjAzMzE0WhcNMTkwNDIyMjAz
+MzE0WjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
 cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
 bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
 UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
@@ -81,13 +81,12 @@ NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
 8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
 lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
 I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
-LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
-ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
-feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
-SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
-Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
-
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZhN6yFJijeBhyIU+td6IXlEQ9hNJ4CJd
+GXb/jpnyYj5DOYSBKE/0mQd4zPoME7Xc9+Zz8FErWxephrvNVm8sSNmWjKqGJpCt
+vAjhJhL48QkjqgGWQJq0kVyHEfuwFbva3mH22I1oRrsnw44paMVHOrNtcEkf2NL2
+aDYQL1qLooSFjrvndyvfEIlxa+QJP8D9pgD3GLtiyPt4WWcUb4SmXrVc1RpFZSyU
+tVN4EFbgvRCPqHc+GX/5vjxJwTl7tFO9Jqa0C5i/4mRhqW5wRqd7I35KTJTimc/b
+kCPbbyEGhzyWdtZGIWPGqY+fZw8Z6WcAOOr25/JEw/veCHLskaV6GA==
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -103,8 +102,8 @@ Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifpb.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Jose Hermano Cavalcanti Filho</SurName>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br.xml b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
index 6eb22eaf..ca21033e 100644
--- a/swamid-interfederations-2.0/idp.ifto.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
@@ -23,26 +23,21 @@
       <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==
+    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
+MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
+SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
+zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
+GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
+Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
+EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
+KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
+lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
+5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
+RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
+Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
+t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -65,27 +60,21 @@ Lqis4w==
         <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==
-
+MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
+VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTE0MDQxMDEyMDkxM1oXDTE5MDQwOTEy
+MDkxM1owKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTw62MPvGqETh9JqxpDT
+SEk3yr0pgXrgqsueDBe1fw1+A/xsdd12PL6L+Js5Fmwzr2bi/CwQgS8sus11FfKb
+zNyxeMnK5emZHOVDbw8E2MRk2RwHy1dzt99G/tgRUh2fqQYoKDFiVHvbmKOCtmtY
+GB7teGLk+eXw5dwdrcy0h8pNajTIOoNEoDhYwlIHvreQLGrLP5zEtDRX9QkWqU6o
+Gl4fltzgjFGvh+DNGNVcbZC3dF/kklTLTlK2irSoC4ODYe/8riJkOPHq2/J6LILc
+EPNXpiETPk+eRriDu87GFCyayqKV3dx1OIeTj7p1ZnBu13W0j1YdoPzT8+qc1lb2
+KwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBixVogGPehJzerTgHq/OYdxdrB99If
+lVlB8/+hjbDLrSulsX6zKdUdladNg+RuaCl11SrbqoLmCigoCNXcshcg2xgKfRhz
+5Wsuuzr8VZHoPbfEF3rTS0uS+jUTB2BdeXWqek2kjWxpFs54FqFNSQgBoEoLhTvm
+RWwFISF/Zg4HP+PZDzEsK7Q+3Wvif0qhVsrBCGG9n9V0opTDLVtt6fDNX/JxQt6t
+Xsa6qY7j1iHlZ30Ff7sRrhr2jTC47Zgw8cDb3ydsQwoU6rtma0M9eONgIetjuGfn
+t5gva52zrXfpmczFDORrRV/XxIxyGrLbPXyVX99ovMbVvGQPuZDY4cSy
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
index 367186d1..3661d33f 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
@@ -22,39 +22,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
 BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
 MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
-MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
+MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
 V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
-Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
-FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
-jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
-T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
-6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
-ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
-aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
-KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
-I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
-chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
-ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
-Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
-GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
-mqPg
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
+NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
+RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
+pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
+z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
+qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
+NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
+MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
+FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
+EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
+Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
+gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
+kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
+MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
+JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
+nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
+W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -76,39 +75,38 @@ mqPg
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFwDCCBKigAwIBAgIHF2Szd19csjANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
 BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
 MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
-MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MDQwOTExNTgzMloXDTE5
+MDQwODExNTgzMlowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
 V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
-Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
-FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
-jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
-T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
-6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
-ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
-aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
-KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
-I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
-chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
-ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
-Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
-GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
-mqPg
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyEZ4OJwh5/R7ZB
+NcfP+r4rGj11okOTedH/va1+NvjqXbOD3704Xb9t67RvvMh9opZ2PRlfINmf/JuE
+RB6OuXH6mZRIZQbfsTP6F1npxeh4yPc+psoFdBu45CGX8+drBhNX9RlsNE6pmEvE
+pPPMRO9gBbScEFBmZty+h0Su2/JgKtqyC2alBP6QperUm8zNJ3y3bnRJWfuFnUfJ
+z4FVsxPwYsyY3lh756nGq2ihcEQzmGZ+oRUDxyjeRFWZrlgGyN6oD7ZVFnbFhI8H
+qa7CkvAy/owny/FQuGO6JC4To1bqeSX+Zcn/TV6HuZg6ybE/zUR9dHeU28qKIRPj
+NKGftvkCAwEAAaOCAjIwggIuMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMB
+MBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPnubw0XZJS8MA74
+FBf+epBbXm05MB8GA1UdIwQYMBaAFCC9cYmlySozLxHgH+WUJlYPEQIlMDkGA1Ud
+EQQyMDCCFWlkcC5pdHMuZnotanVlbGljaC5kZYEXd2VibWFzdGVyQGZ6LWp1ZWxp
+Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUHAQEE
+gb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQCAv/nuosclU7sm5SDc5LZW8K032GuWk33S7ZAH
+kCmkNB9rPbEBQcKZxEIzIH8TwrMPPTmqZMNPTuhHBdcEmeVnWkr5F1omxxHUn3GF
+MDXMffSER54HMfWSc/D0f8VyyoKHwotD6dYEwSQSWKtPV0Rv4OCf2LGzAukDAXOO
+JaSL11iVqzuAYlUMYQ9TrFmCtf/xr0gbiKL9QgDzOe6P4k2nDid/G7bWZYswbmb7
+nzmhmPE5BMRvs/TBhoqLTzhrLdUyOIToUS5IMkynRqM1Ylf8d4PImgeC7Wyb30IP
+W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie.xml b/swamid-interfederations-2.0/idp.ittralee.ie.xml
new file mode 100644
index 00000000..320aae45
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ittralee.ie.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ittralee.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHHjCCBgagAwIBAgIRAICl/N1E7wMHQx0BHxXzfIcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA2MTUwMDAwMDBaFw0xNTA2MTUyMzU5NTlaMGwxCzAJBgNV
+BAYTAklFMScwJQYDVQQKEx5JbnN0aXR1dGUgb2YgVGVjaG5vbG9neSBUcmFsZWUx
+GjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAuaXR0cmFs
+ZWUuaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxKUs5pMtPd67K
+ZMFt/99ej/P5VoPJbUbOXFiszLIPkrFQ85+D+mVHmw/jwjSsAcfVNRySyoV3j73n
+mNAS6LsQz/sWiphhe2xIgf5dlqS9zzUKmM4ClCZFq43cszbVx+1Jskqa5jGktNR7
+ZwETDmxOkb2LgbxVLANTwxQS0LrkhH0kzHRSho3zw/OeVJ2aBWWfSmQ/8J4s8oDn
+isSkYDo2J0jCOfxL6bKjA/tAwMIE4KELWfTMojeu5apwwdQ7is2sxj5HD4krrlzX
+n06EtBBural5RW8KJKuy/ck4vp4YEh3V79T5wpmcE/y2Lnux6bdBl8bZwhZOPhTe
+naEC7crfAgMBAAGjggPvMIID6zAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUekxTs3jqasbfKOoDk/nBK6pIDCswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
+cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
+AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
+YS5vcmcwggKlBgNVHREEggKcMIICmIIPaWRwLml0dHJhbGVlLmllghNlZHVnYXRl
+Lml0dHJhbGVlLmllghllZHVnYXRlLnN0YWZmLml0dHJhbGVlLmllghxlZHVnYXRl
+LnN0dWRlbnRzLml0dHJhbGVlLmllghhlZHVnYXRlLnRlY2guaXR0cmFsZWUuaWWC
+E2VkdXJvYW0uaXR0cmFsZWUuaWWCGWVkdXJvYW0uc3RhZmYuaXR0cmFsZWUuaWWC
+HGVkdXJvYW0uc3R1ZGVudHMuaXR0cmFsZWUuaWWCGGVkdXJvYW0udGVjaC5pdHRy
+YWxlZS5pZYIVaWRwLnN0YWZmLml0dHJhbGVlLmllghhpZHAuc3R1ZGVudHMuaXR0
+cmFsZWUuaWWCFGlkcC50ZWNoLml0dHJhbGVlLmllghlpdHQtZWR1Z2F0ZS0xLml0
+dHJhbGVlLmllgh9pdHQtZWR1Z2F0ZS0xLnN0YWZmLml0dHJhbGVlLmllgiJpdHQt
+ZWR1Z2F0ZS0xLnN0dWRlbnRzLml0dHJhbGVlLmllgh5pdHQtZWR1Z2F0ZS0xLnRl
+Y2guaXR0cmFsZWUuaWWCGWl0dC1lZHVyb2FtLTEuaXR0cmFsZWUuaWWCH2l0dC1l
+ZHVyb2FtLTEuc3RhZmYuaXR0cmFsZWUuaWWCIml0dC1lZHVyb2FtLTEuc3R1ZGVu
+dHMuaXR0cmFsZWUuaWWCHml0dC1lZHVyb2FtLTEudGVjaC5pdHRyYWxlZS5pZYIV
+aXR0LWlkcC0xLml0dHJhbGVlLmllghtpdHQtaWRwLTEuc3RhZmYuaXR0cmFsZWUu
+aWWCHml0dC1pZHAtMS5zdHVkZW50cy5pdHRyYWxlZS5pZYIaaXR0LWlkcC0xLnRl
+Y2guaXR0cmFsZWUuaWUwDQYJKoZIhvcNAQEFBQADggEBAHjXLPk9KPTqPI80e5zR
+qz4gwcjPCrQqryNpQGmytbbfCL4QW7c0PTy/c43ju3gq4MbAttEf1ge77Nl3Yfrq
+CsjKmNYc964eEEYYO7iYix7JyAQLmeu5bkoRFFFUQKnkzl7c3tIf3fDS6d7Sx6D7
+C12B9qDv2qG/nShGhJ2VvpOy+4xynYIjDiwDzpwPbzkXMxrLi0ijaxh6HHcKzhq4
+ZVgVNZ07Tys+K3tmsfmfooBSu5eK68j203D3QHTHI9qbuaYq5E/yWp5+a1NcVRNF
+l8LhNdF4JciKYZNIq8wIAaLgToUhXbzAbMKZhq+FXAxncLCA3bbd+7LrMQW5lAmF
+TVY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ittralee.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ittralee.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Tralee</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tralee</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ittralee.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Quirke</md:SurName>
+    <md:EmailAddress>andrew.quirke@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Chris</md:GivenName>
+    <md:SurName>Bradshaw</md:SurName>
+    <md:EmailAddress>chris.bradshaw@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Padraig</md:GivenName>
+    <md:SurName>Dineen</md:SurName>
+    <md:EmailAddress>padraig.dineen@staff.ittralee.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
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 8d773161..0c298c54 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -23,7 +23,7 @@
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIURk5Mvu+xPoln7suz9TRey3n9W6owDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLm5paWYuaHUwHhcNMDkwMzE5MTUxNDI5WhcNMjkwMzE5MTUxNDI5WjAWMRQwEgYDVQQDEwtpZHAubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtb3M1DxuXOF4V9t7rnssnmBOw3TPKE1sbN7bnHZTdutfi/CNpxKHMY8Jz7wpPyXs3Q02mZWWADlp+WaCh1Kg+4UuLFObv3IWm9F2XXrMiFCRATmiB2mkkG07bpe7fNhHT3uBq7UqyhIAPcjynELzVyaawAIUfLSjNaeQGpm6hNCNsj+WeIAzAccH+Rau6N4DUefAmKVSoxwo0WpCJdgu95ApvvpWY1vf7WHxqG4pSjUM0oE0yfg3k3bkj5i2M+NMGZPPPeTf1cVliKD37nGk8QGCubV2VI+NlSnye45nB6irGdkHfIQGzDmfYCQ1gS1hagOryjrq6jJWcXJzIugpsCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLm5paWYuaHWGImh0dHBzOi8vaWRwLm5paWYuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLi4+VWomShT2Y6eVzoLuWkkiHYlMA0GCSqGSIb3DQEBBQUAA4IBAQBdZ8ofazFei8yMDzIIrMvdU2szDo538cU8a3hFhDcHC6k30KO0WoTWdwMWGQ70CY5/Kz0PW60esi3WssVG4+uf3km/yemMwaQAvJ1uhRIsH+W4ByQ/c6SLFHb14MFeyONLVB4hFcM5yYlIiCVDfHJTJ5NerOVhDDxh70a1/VdN7jzS/PanEkeLgFsbQp+tQ3UiW2ukCS7FVRFFRwtAyDrjDB0waz+mdLb9JMxbfbSsnHsRM8PwUXAYAhNJP8I1LCTQRUsOXIX2Bu7LDhfPuDfW1uUoD5loXewQUetfYt/L3trt6OplJHdYXd7nL5zWzRdAFzMB7KYuaKgFLjgfQZH/</ds:X509Certificate>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAPlKCyW+F3hqMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA0MTAwNzA4NDVaFw0zMzA2MDkwNzA4NDVaMIGFMQswCQYDVQQGEwJIVTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UEBwwIQnVkYXBlc3QxDjAMBgNVBAoMBU5JSUZJMQwwCgYDVQQLDANBQUkxFDASBgNVBAMMC2lkcC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa3pkANdEGmJ/CXbDCeH+UKbqvMmpSga+dUpaJ8X0KpIbb+gZBUgj3IqLZTtlf3A2CEUI9LLcAEbQln8rB5KMAMzsyyX6JUJzGsSkpKuu0Oticw3oXooNd4a9FYsdZON8iiSFrquzSiuov9Q1qslwafOxGhkwJr15HqChRfxcXI61Sid0FEAfSocrgMkdxoCq2YIWug17egIqA6gzKbThOmtAJe5Cw4gAVY2QBDut9e/F6q4kM9ukfEQwwnlC1ghP+5T6kMq7uKAd98yZv6/s95Eqiy7C7T2BiAmCqJy6Ef/I9tRKD3lvpcm32tlhprfpetBHq4OLG14Ieqhj8rZaMCAwEAAaNQME4wHQYDVR0OBBYEFDkbK3v2IgzSeNCN1LrKR75aStlYMB8GA1UdIwQYMBaAFDkbK3v2IgzSeNCN1LrKR75aStlYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABPM/c1QSk2ZHHUkgM60+yvrDVtMtKIdxGgpulksHUDRoCiP/1wxjCS0EFS4t/4rYogokaEfCo8Wi9VuoJS8xVlBFKe8XD3LrqKy5lbKZp10rb2e4PiCb7WlAL04kLdtogrNJfYfH13yHwYGuxOJN95SLaXw8hj7fhf6NtocI7zTAIoMeizsQ6KjhKSNiYfokAhYzsrLydmeNnVZmYL06YOS289Z6pFmarOuhDycAuZDBV7AND592hCKqwh3KyTxhlzzxVAQZXb/s9kwVqaNWZ7ChO23REDrHfbpi14tty1WFi42/RHginxT1yPRvX3PwXnwrQP4CvYMSsXEhu3Otgo=</ds:X509Certificate>
         </ds:X509Data>
         <ds:KeyName>idp.niif.hu</ds:KeyName>
       </ds:KeyInfo>
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.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
index 51f14e45..01104669 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se.xml
@@ -8,6 +8,17 @@
   <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">bth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - Students</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">idp för Blekinge Tekniska Högskola - Studenter</mdui:Description>
+        <mdui:Description xml:lang="en">Identity provide for Blekinge Institute of Technology - Students</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>bth.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -81,9 +92,22 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
     <OrganizationDisplayName xml:lang="en">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Blekinge Institute of Technology - Students</Company>
+    <SurName>IT Help Desk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Martinsson</SurName>
-    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+    <Company>Blekinge Institute of Technology - Students</Company>
+    <SurName>IT Help Desk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Blekinge Institute of Technology - Students</Company>
+    <SurName>IT Help Desk</SurName>
+    <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+    <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ueb.cas.cz.xml b/swamid-interfederations-2.0/idp.ueb.cas.cz.xml
new file mode 100644
index 00000000..752e7eed
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ueb.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ueb.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  <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">ueb.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Experimental Botany AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UEB AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance UEB AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ueb.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ueb.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ueb-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ueb-137.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
+MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
+JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
+1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
+bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
+oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
+uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
+6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
+5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
+iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
+AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
+3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
+dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ueb.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUHyGwRd1qr1kyh3xpoh7NDGHcOCEwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLnVlYi5jYXMuY3owHhcNMTQwMzMxMDgwNDMxWhcN
+MzQwMzMxMDgwNDMxWjAZMRcwFQYDVQQDEw5pZHAudWViLmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAI/mgzyHJjo9tvPdwC/oCHl50NDMEj6d
+JeT6waZ8s39B3CjNvtuKZOng7C/LWD/PSafukUVzWSR7f1C2p2Cv1lcu6BzOfWRA
+1WEQ5G0CeEJinFRdDJhCwhvyZpXY7NKcN1hl64m7K/WnvjZzEXEcko9k9JF1qKTS
+bXa7p/miBDGLOOBpPcc7e1TQ6yyYpcjTVw6jGCaN8ELL9rXuB59nypLydNbmS1qL
+oxJJ306cl5uyt+p09lWu4AnUYjcJDpzng+qjMyac96fPqjWLTwfl2GQmWfA2zehd
+uKad6sO9pGgkulnccPrBo6tIPS2XQ0s4lBrKhbFY0C8UxndtFbwAIEsCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLnVlYi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVlYi5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOcJV+6pYxQ7C0fQVs0eMtdd
+6f9AMA0GCSqGSIb3DQEBBQUAA4IBAQA8fi7T3V7TQJX7DLQqSsbw9c+ANvRCi/rm
+5GCPdphUBoRZl0p9a2X/waP0aAqJY1IwyAhzzzzaTlXKg6Jj0HkrLZJLECZMPvpM
+iTV7Le/b6sPURJSPUe9A4QExG8CAZhNIZPj+9Q/pS4qX0M9QtL3OoKE30UicL+6+
+AkhT2im4Zc1lmacedEQVFzMPL2dObjDFaYRlTsN2pXElZhrovJGyhIha2nApLR4v
+3JQTA6oUyYFCR2WbQrj00tGndynKeS2Mv0b5Wy8ZMka8DO66u7SMMe8BQ0o2pqXZ
+dCtc+UFehI+q6OrKFdSE+mtuSZkofFrYIdgJb0lqJlDYmfpi/hzS
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Experimental Botany AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.ueb.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufsm.br.xml b/swamid-interfederations-2.0/idp.ufsm.br.xml
new file mode 100644
index 00000000..b399d033
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufsm.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://idp.ufsm.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">ufsm.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFSM - Universidade Federal de Santa Maria</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufsm.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufsm.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
+hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
+KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
+A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
+U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
+5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
+u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
+H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
+VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
+d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
+ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
+2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
+Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
++jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
+dwJYMximHcBNMJ0UieklpL0lmx0=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.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">ufsm.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLDAqBgNVBAoTI1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIFNhbnRhIE1hcmlhMQwwCgYDVQQLEwNDUEQxGjAYBgkq
+hkiG9w0BCQEWC2NwZEB1ZnNtLmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgG
+A1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
+ZHAudWZzbS5icjAeFw0xMjEwMDUxNDA1MzVaFw0xNTEwMDUxNDA1MzVaMIGtMSww
+KgYDVQQKEyNVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTYW50YSBNYXJpYTEMMAoG
+A1UECxMDQ1BEMRowGAYJKoZIhvcNAQkBFgtjcGRAdWZzbS5icjEUMBIGA1UEBxML
+U2FudGEgTWFyaWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
+EwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDWBJ1zOYMt8oRHINxfgHCz/YAWxSb2vSxeOu50Jdr+EzKQYMj4
+5eeXhCNYGlWtqPI+rMZj4i3p8P+xbaK+RzXJavEF0gyv3qcamJWBd5GseyO/Q5gd
+u4DpJ5lpA5P1zm2Q646p1swNAlENjS756Ux5MfWFPfRYc3u04Y9W8EDfKMPMYSs2
+H+bFi0Ucn4DaEkUiDc2noJuJMM08m3Nl5GTUEwZSRJAlV9OT2tUbXAfeqdXyteS4
+VaFzc4vt0KqUwATvxhIygOqX+9I7nitBg3wfXbHsmYBo14AUsPxJvVFUV2bLUd4l
+d/xr71cxlkFHk4mzRe5C2kDLYcvYaIqv/jyjAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAKiirihev0E7qiHKcDQjWPxP1RTalsGly1pAWYUp1ikY7R2n+VzsSTVu6xh4
+ITgI1YIsHOdQ9eepAQCiEcuPim7CnzcKb1Ru6vgiXxgO9hJg0iNmcycPFQR8t5rk
+2fFUgF2GjL+lpOEnCgKn7WPEsAAHnLHsJjCbNcbX7B12awaVu6Q2nuiBcX2EC/PD
+Vvgi6N7sh/ViG8whuT4y7vN0Zdnc8FdbRFVkgl6FInPQa27MNQL7ZukyxmU+A9AF
++jDBH/uGNUgpWLHqS/d+TMq0SPcrLoedtMjcadIQIpMgyIk14QvJGo/YB9sgtvHM
+dwJYMximHcBNMJ0UieklpL0lmx0=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.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">UFSM - Universidade Federal de Santa Maria</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufsm.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Fabiano B. Franco</SurName>
+    <EmailAddress>fabiano@cpd.ufsm.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhk.cz.xml b/swamid-interfederations-2.0/idp.uhk.cz.xml
new file mode 100644
index 00000000..b24eeffe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uhk.cz.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.uhk.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <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">uhk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Hradec Kralove</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Hradec Králové</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Hradec Kralove</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Hradec Králové</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.uhk.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="90">https://idp.uhk.cz/images/logo_40.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
+BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
+BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
+DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
+v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
+k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
+US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
+3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
+aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
+vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
+aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
+/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
+sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
+2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
+PZ/kn4a7
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uhk.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEgjCCA2qgAwIBAgIQMky1q3HrRxPo56VN/NmU0DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDkxMTAwMDAwMFoXDTE1MDkxMTIzNTk1OVowSTELMAkGA1UE
+BhMCQ1oxJTAjBgNVBAoTHFVuaXZlcnNpdHkgb2YgSHJhZGVjIEtyYWxvdmUxEzAR
+BgNVBAMTCmlkcC51aGsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDrU/S+ixb9ntWiK6bR0xSfKh0mUBUAn8JqIHHTQ3rtUr+kQteHHg23M8iPTcia
+DR9U7oMCrAMeVdI66Ld3tMe2OrmZVIuY654Yj55Vcw64Ew7kKmtflOY4VRtaPzZo
+v2cUVa7aTyJ+740LY7mBS4B1FOoDsxmk0CW64luYoi71cLLC3oxZwa0RXiJEQCX/
+k1H4TwnuZZA3J57TEQWwZ0WBr9jHUhDUNy0UxLnnpgla3Eo/TC8+s0qm1xge/NBV
+US2kT//puh234zpU2t8nSkw5uPKjxnIJCd7o/8/d738kQQtc2nCKdilFRKST+E7Q
+3vuzjEYHYe5oLZrg22u7AFrLAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUUBJ3Z32TA3bLvPrqbqT4dXZ6O0cw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51
+aGsuY3qCC2lkcDIudWhrLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQAYaJ0RPwGFOXz9
+vCDdQ8rFUicwvoSzL8RrOgtsayyVvtysYJJykVpfmT4ytzgLXI7ilqpCQ3wic/OR
+aQMVyyhhXV8yoUOdxugs5IPCFDDJOaPH2jtwkY8DWOapCEzSNwK0AvxZ5jCCA3rF
+/01BkC2pDt4yOoBTYhCOWigvWcDY7UNCubK3SCzjNGlhoWq0Y3glao0yx4HItwbQ
+sBMIvj9fFFvn0bpREgour8PC18anj/QK2t0jLGu0D6KOHrRmY2043ylhl7Uk/CWH
+2DYpexi2dfcGYko0lfaQ3i8W2GT3jAuSSy8FzY3QKBw9B6MvG4OJfleh+QC5V1ff
+PZ/kn4a7
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Hradec Kralove</OrganizationName>
+    <OrganizationName xml:lang="cs">Univerzita Hradec Králové</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Hradec Kralove</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uhk.cz/en-us/Pages/default.aspx</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.uhk.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Lukas</GivenName>
+    <SurName>Kummer</SurName>
+    <EmailAddress>lukas.kummer@uhk.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujf.cas.cz.xml b/swamid-interfederations-2.0/idp.ujf.cas.cz.xml
new file mode 100644
index 00000000..cd36fa30
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ujf.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.ujf.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  <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">ujf.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider NPI ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚJF AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ujf.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ujf.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ujf-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-ujf-201.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
+DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
+Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
+hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
+8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
+N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
+g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
+/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
+/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
+VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
+qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
+5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
+omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ujf.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAOD7Yz6jYE8fRkrwh1ZXoCmNIVU6MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC51amYuY2FzLmN6MB4XDTE0MDQwMTExMDUyOVoX
+DTM0MDQwMTExMDUyOVowGTEXMBUGA1UEAxMOaWRwLnVqZi5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk6sa+XtQhFGDXscfnTX1UUzCmoDh5
+Kz4uFhU7NlFIK7uAjTp3QivxHKiCEP71zGnOcHC/sxBcEa7mt5qcp8eRuN9yxQRQ
+hB82z2WGHmzhB5qn6DCf1gMHMdlF1xSjm5tttmYyyTRqeKFDj4G7kkbvZoLC88UA
+8b5mqLubMNfGbDARjEQdAFjHbi6KZPvxHEg9EHxfSQHPwOon1GBpy565iacaZyKq
+N1c6rBQ1Dk7wM7ggbzye663O/BE3iL3i6j3trKD5oNp+73UHHDov1uevf6a+ytJd
+g7ls87pFGYEnkjMLOQz1ClsbOGmqcpLIaVxL5A0MqLaA1W/a8EyXXSFHAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC51amYuY2FzLmN6hiVodHRwczovL2lkcC51amYu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQTmbv/Y1doqdDwVhaTZm6
+/cTQSjANBgkqhkiG9w0BAQUFAAOCAQEAAymJ3004P1+g69w44c50ARFmSwmNkRig
+/NYhXIBOHCMmHDpzCNBmlLYlxHqf/eoOcC2aEnJsjHt442tmw33Wz4BE4k8X7S7Q
+VskudwRhmCqSglM4OI7hDlNqL7RqFFph6TgeNXHlJgC7ZPZT8///0AlDXI0Zlo1i
+qmRTjFNJq948mACt8uENgTAANFT76+OJMAPfd/9ILn+2EX6rf/yg/DjWzGqcoDkS
+5/h7LWagG5taDgrHmTzYp5+PumgVB2l8avie+ABirn//quP3ppZbSP5xD3ODhx77
+omalIqG0h8g4GccE3iuYIFki2jTqg3YNgi/tWm8a2ORKi9t4kDjUQA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Nuclear Physics Institute of the ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.ujf.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
index c266e5b6..11c6add4 100644
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ b/swamid-interfederations-2.0/idp.umk.pl.xml
@@ -1,7 +1,7 @@
 <?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-04-07T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-28T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.uoa.gr.xml b/swamid-interfederations-2.0/idp.uoa.gr.xml
new file mode 100644
index 00000000..a67083a2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uoa.gr.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uoa.gr/idp/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>
+  <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">uoa.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIFMTCCBBmgAwIBAgICAKowDQYJKoZIhvcNAQEFBQAwgc4xCzAJBgNVBAYTAkdS
+                            MQ8wDQYDVQQIEwZHcmVlY2UxDzANBgNVBAcTBkF0aGVuczE1MDMGA1UEChQsTmF0
+                            aW9uYWwgJiBLYXBvZGlzdHJpYW4gVW5pdmVyc2l0eSBvZiBBdGhlbnMxIjAgBgNV
+                            BAsTGU5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIxJDAiBgNVBAMTG1VvQSBDZXJ0
+                            aWZpY2F0aW9uIEF1dGhvcml0eTEcMBoGCSqGSIb3DQEJARYNY2FAbm9jLnVvYS5n
+                            cjAeFw0xMjEwMzAxMDIxNTNaFw0xMzEwMzAxMDIxNTNaMIGuMQswCQYDVQQGEwJH
+                            UjEPMA0GA1UECBMGR3JlZWNlMTUwMwYDVQQKFCxOYXRpb25hbCAmIEthcG9kaXN0
+                            cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVuczEiMCAGA1UECxMZTmV0d29yayBPcGVy
+                            YXRpb25zIENlbnRlcjETMBEGA1UEAxMKaWRwLnVvYS5ncjEeMBwGCSqGSIb3DQEJ
+                            ARYPY2VydEBub2MudW9hLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+                            AQEAqRZyIzMvh6e2QYouyyJvhalZUYi/bRnsPC9oJnr1rw05B8k5yLwHzq+IZmmd
+                            O+UeOBahAy9N7YmTLDMhW7Ay9bmLiQNWyWOHDOuiPPPmiFsGizCriNb6DrwpW8dP
+                            MuHPoCOfnqbq8Y7tDWlXFaoFCbi8wHJ2yB5mkogvTRLr5WKPWbZBV/INZxaFGrTx
+                            KGbHiX7pHcrn6sm+fYRrDbZcPXB52PoMvuvWOGZsVO7l5pu6BNCEaEAwXgqe4Yhi
+                            Xj2HEHiRzcVmYjt/0oD+qfRt6jvaEh7vPdg2fLjz9wq78IKVtOrlRkfu4vCBo4zD
+                            nRYk01rZb3xSZifxEymHt+ddSQIDAQABo4IBNTCCATEwCQYDVR0TBAIwADAdBgNV
+                            HQ4EFgQUreyJLV5OKYErfhArkqguEUjUBtcwggEDBgNVHSMEgfswgfiAFInJKUAa
+                            pXIpThigXx2h7kScHVu5oYHUpIHRMIHOMQswCQYDVQQGEwJHUjEPMA0GA1UECBMG
+                            R3JlZWNlMQ8wDQYDVQQHEwZBdGhlbnMxNTAzBgNVBAoULE5hdGlvbmFsICYgS2Fw
+                            b2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRoZW5zMSIwIAYDVQQLExlOZXR3b3Jr
+                            IE9wZXJhdGlvbnMgQ2VudGVyMSQwIgYDVQQDExtVb0EgQ2VydGlmaWNhdGlvbiBB
+                            dXRob3JpdHkxHDAaBgkqhkiG9w0BCQEWDWNhQG5vYy51b2EuZ3KCCQCt0AX70MoL
+                            SzANBgkqhkiG9w0BAQUFAAOCAQEA8jbUzdaWhAk9EM6wKOzJJ7t/APTTLfECE8sT
+                            0vW7Vqqe3I/TslWLyD7AmnQjGdOHwGZ5ZQZ2wdptDlIl9lkE9viwoPhTW4p1QnuV
+                            sgVF3HjrWDaTHXCx7kjUjdEsGkbycZa47nlAvK7lVcQY2OE6XWG9N8wOruRoc4h4
+                            DwV3n1H7siLVrvcwMezFVYWCeOhQdbG5G5yOyuEl0UJmi0X4Kr6vNSyRYOWlPFMz
+                            wExKBsPjkoTETmUuqKtvDcR0JrNh4HA7wb5ZjAW79xiCmvanMO+7JHjZhm8JZR/c
+                            ufCHaabLya4cnaUuZBjkjqknYcprUvjIH9TlKgd7TRTdatF57A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uoa.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.gr/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">uoa.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIFMTCCBBmgAwIBAgICAKowDQYJKoZIhvcNAQEFBQAwgc4xCzAJBgNVBAYTAkdS
+                            MQ8wDQYDVQQIEwZHcmVlY2UxDzANBgNVBAcTBkF0aGVuczE1MDMGA1UEChQsTmF0
+                            aW9uYWwgJiBLYXBvZGlzdHJpYW4gVW5pdmVyc2l0eSBvZiBBdGhlbnMxIjAgBgNV
+                            BAsTGU5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIxJDAiBgNVBAMTG1VvQSBDZXJ0
+                            aWZpY2F0aW9uIEF1dGhvcml0eTEcMBoGCSqGSIb3DQEJARYNY2FAbm9jLnVvYS5n
+                            cjAeFw0xMjEwMzAxMDIxNTNaFw0xMzEwMzAxMDIxNTNaMIGuMQswCQYDVQQGEwJH
+                            UjEPMA0GA1UECBMGR3JlZWNlMTUwMwYDVQQKFCxOYXRpb25hbCAmIEthcG9kaXN0
+                            cmlhbiBVbml2ZXJzaXR5IG9mIEF0aGVuczEiMCAGA1UECxMZTmV0d29yayBPcGVy
+                            YXRpb25zIENlbnRlcjETMBEGA1UEAxMKaWRwLnVvYS5ncjEeMBwGCSqGSIb3DQEJ
+                            ARYPY2VydEBub2MudW9hLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+                            AQEAqRZyIzMvh6e2QYouyyJvhalZUYi/bRnsPC9oJnr1rw05B8k5yLwHzq+IZmmd
+                            O+UeOBahAy9N7YmTLDMhW7Ay9bmLiQNWyWOHDOuiPPPmiFsGizCriNb6DrwpW8dP
+                            MuHPoCOfnqbq8Y7tDWlXFaoFCbi8wHJ2yB5mkogvTRLr5WKPWbZBV/INZxaFGrTx
+                            KGbHiX7pHcrn6sm+fYRrDbZcPXB52PoMvuvWOGZsVO7l5pu6BNCEaEAwXgqe4Yhi
+                            Xj2HEHiRzcVmYjt/0oD+qfRt6jvaEh7vPdg2fLjz9wq78IKVtOrlRkfu4vCBo4zD
+                            nRYk01rZb3xSZifxEymHt+ddSQIDAQABo4IBNTCCATEwCQYDVR0TBAIwADAdBgNV
+                            HQ4EFgQUreyJLV5OKYErfhArkqguEUjUBtcwggEDBgNVHSMEgfswgfiAFInJKUAa
+                            pXIpThigXx2h7kScHVu5oYHUpIHRMIHOMQswCQYDVQQGEwJHUjEPMA0GA1UECBMG
+                            R3JlZWNlMQ8wDQYDVQQHEwZBdGhlbnMxNTAzBgNVBAoULE5hdGlvbmFsICYgS2Fw
+                            b2Rpc3RyaWFuIFVuaXZlcnNpdHkgb2YgQXRoZW5zMSIwIAYDVQQLExlOZXR3b3Jr
+                            IE9wZXJhdGlvbnMgQ2VudGVyMSQwIgYDVQQDExtVb0EgQ2VydGlmaWNhdGlvbiBB
+                            dXRob3JpdHkxHDAaBgkqhkiG9w0BCQEWDWNhQG5vYy51b2EuZ3KCCQCt0AX70MoL
+                            SzANBgkqhkiG9w0BAQUFAAOCAQEA8jbUzdaWhAk9EM6wKOzJJ7t/APTTLfECE8sT
+                            0vW7Vqqe3I/TslWLyD7AmnQjGdOHwGZ5ZQZ2wdptDlIl9lkE9viwoPhTW4p1QnuV
+                            sgVF3HjrWDaTHXCx7kjUjdEsGkbycZa47nlAvK7lVcQY2OE6XWG9N8wOruRoc4h4
+                            DwV3n1H7siLVrvcwMezFVYWCeOhQdbG5G5yOyuEl0UJmi0X4Kr6vNSyRYOWlPFMz
+                            wExKBsPjkoTETmUuqKtvDcR0JrNh4HA7wb5ZjAW79xiCmvanMO+7JHjZhm8JZR/c
+                            ufCHaabLya4cnaUuZBjkjqknYcprUvjIH9TlKgd7TRTdatF57A==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Athens</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Athens</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uoa.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.uoa.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>University of Athens Helpdesk</SurName>
+    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>University of Athens Helpdesk</SurName>
+    <EmailAddress>helpdesk.idp@noc.uoa.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se.xml b/swamid-interfederations-2.0/idp2-1.slu.se.xml
index c7a18791..983b259c 100644
--- a/swamid-interfederations-2.0/idp2-1.slu.se.xml
+++ b/swamid-interfederations-2.0/idp2-1.slu.se.xml
@@ -13,9 +13,14 @@
         <mdui:DisplayName xml:lang="en">Swedish University of Agricultural Science</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Sveriges Lantbruksuniversitet.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Swedish University of Agricultural Science</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.slu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.slu.se/en/</mdui:InformationURL>
         <mdui:Logo height="100" width="100">https://idp2-1.slu.se/info/images/slu_logotyp_web_100.png</mdui:Logo>
         <mdui:Logo height="16" width="16">https://idp2-1.slu.se/info/images/slu_logotyp_web_16.png</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>slu.se</mdui:DomainHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -87,16 +92,22 @@ o04ltBnMhQ==</ds:X509Certificate>
     <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
   </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>SAML Admins</GivenName>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>Bengt Norman</SurName>
     <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <TelephoneNumber>+46 90 786 81 22</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <GivenName>SAML Admins</GivenName>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>Ivan Clegg</SurName>
     <EmailAddress>saml-admins@slu.se</EmailAddress>
+    <TelephoneNumber>+46 70 2413737</TelephoneNumber>
   </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Help Desk</GivenName>
+    <Company>Swedish University of Agricultural Science</Company>
+    <SurName>IT-stöd</SurName>
     <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+    <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
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/idp2.redclara.net.xml b/swamid-interfederations-2.0/idp2.redclara.net.xml
index 8f091bee..0b4f32f2 100644
--- a/swamid-interfederations-2.0/idp2.redclara.net.xml
+++ b/swamid-interfederations-2.0/idp2.redclara.net.xml
@@ -15,8 +15,8 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
         <mdui:DisplayName xml:lang="es">RedCLARA</mdui:DisplayName>
         <mdui:Description xml:lang="en">RedCLARA - Latin American Cooperation of Advanced Networks</mdui:Description>
         <mdui:Description xml:lang="es">RedCLARA - Cooperación Latino Americana de Redes Avanzadas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.reuna.cl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">http://www.reuna.cl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.redclara.net/index.php?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.redclara.net/index.php?lang=es</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -64,7 +64,7 @@ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
     <md:OrganizationDisplayName xml:lang="en">
 RedCLARA - Cooperacion Latino Americana de Redes Avanzadas
 </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.redclara.net</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Carlos Gonzalez</md:SurName>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
index 918fa685..ef04b671 100644
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
@@ -23,28 +23,26 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
-byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
-MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
-MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
-MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
-dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
-U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
-YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
-aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
-KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
-zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
-EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
-7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
-I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
-KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
-hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
-BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
-TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
-Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
+    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
+byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
+MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
+ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
+DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
+EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
+DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
+7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
+VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
+TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
+XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
+/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
+fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
++uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
+iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
++PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +65,26 @@ Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
-byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
-MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
-MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
-MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
-dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
-U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
-YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
-aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
-KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
-zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
-EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
-7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
-I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
-KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
-hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
-BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
-TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
-Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
+MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxLDAqBgNVBAoTI0luc3RpdHV0
+byBGZWRlcmFsIGRlIFNhbnRhIENhdGFyaW5hMQ0wCwYDVQQLEwREVElDMRYwFAYD
+VQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcNMTQwNDEx
+MTg1ODA4WhcNMTcwNDEwMTg1ODA4WjCBmTEsMCoGA1UEChMjSW5zdGl0dXRvIEZl
+ZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmExDTALBgNVBAsTBERUSUMxFjAUBgNVBAcT
+DUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQG
+EwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8deKLY8l4j2LLmbN/PE
+DDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFxzAgTFyB8GKJU3E4L
+7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIPEakOzSOMWfvsl54E
+VgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed7xqj4AHA49Sljpbr
+TOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4YI9HkE599xiNjK19q
+XrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAc/Sgpg8yWTUBY45Yp1Rs4yY3r3kLlK771TdEIVK6uQbLIwzo
+/cidWUp9F7HoJSlT478Z1kpGVDw/nqX9HVKXVcwaGdpae2zq6SBVSmGuwx6WkI0+
+fHw5DsGkY5CuMXIDRGW3G8uhO2dVIqSUaju1W8UCCrZbcWCWQJHPtDe7zGRgtuQV
++uFs8FxtcQnLGOe0GmT48n9jW0ylQYrG5nbQ7jd0XQSGFMvuWj0tvM+i4q4XefHW
+iqG4LoRUqbCxPpagxpe/lKP1z8DQo0sWH/nfCuDYrSIvMV2PdMwIJqFVahF/QH6w
++PpKrPXPFokR6cpvUAZYVpFuacTUNza0Knpicg==
 	    
             </ds:X509Certificate>
         </ds:X509Data>
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/ldap-dariah.esc.rzg.mpg.de.xml b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml
new file mode 100644
index 00000000..940abc60
--- /dev/null
+++ b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldap-dariah.esc.rzg.mpg.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:17:38Z">
+      <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">dariah.eu</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Homeless IdP</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Homeless IdP</mdui:Description>
+        <mdui:Logo height="16" width="16">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower_icon.png</mdui:Logo>
+        <mdui:Logo height="154" width="160">https://ldap-dariah.esc.rzg.mpg.de/images/DARIAH_flower.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dariah.eu/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
+aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
+q1AZvg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dariah.eu</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ldap-dariah.esc.rzg.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ldap-dariah.esc.rzg.mpg.de,OU=Rechenzentrum Garching (RZG),O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFEDCCA/igAwIBAgIHEy5eQihwbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMjAxMTIx
+MzMxMzFaFw0xNzAxMTAxMzMxMzFaMHsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdN
+YXgtUGxhbmNrLUdlc2VsbHNjaGFmdDElMCMGA1UECxMcUmVjaGVuemVudHJ1bSBH
+YXJjaGluZyAoUlpHKTEjMCEGA1UEAxMabGRhcC1kYXJpYWguZXNjLnJ6Zy5tcGcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbyc9BVBglxQEt8MmI
+cbf3GKqCdQADGnnNXAwx9gjq5mQI2+VNGcBk8aq24p5a++hlemue+6P6RQONiv5z
+sAXlIZb6MuGOcF6gOUqRijMuWW1OueysiO4F5ODOJ8TaGSjWytCSQ28cpJbc7wWo
+mnlZxL6NvVyRiDCJuUfDyIW8ICgk7Aw1K0UdpJXeVzFUiBtTIM7Ira80o3yeLDhi
+DDPc+swDZA9syWvn8/W57kN0/vtUYKzGs6Ae+uRxahSfNg/kx1Rnv0sUln1hgUHh
+VuiKqu1MlAIcckNt00Ck/v7LQV98KJJx+rWWPV1F09a6vPEAesEY+GnJQkwAzh/O
+xiTjAgMBAAGjggG0MIIBsDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFEnnIPu9e2M7ABKF66CA
+uTWv1Jf8MB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMCkGA1UdEQQi
+MCCBHnNlcnZlci1jZXJ0aWZpY2F0ZXNAcnpnLm1wZy5kZTB3BgNVHR8EcDBuMDWg
+M6Axhi9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA1oDOgMYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAxDSpJ7Mn2hmiyDzK
+VVtARi1U9EvfTcSIWZFanc1xn9DaFI8s3c6vnEB7+BL/HMbAwnDauWjUPoNzc5I2
+TeH5IjX8MGDjEh7TyNyycWRNJ88ah0LtQoaCgXc0vpTtXZzGelh0A25Hw80sHKa1
+xY4iDAPYwaPY+kFxxAGyeAL9M4q9Z39t6ZIoze+lQm0sxQ3eTvQUPwukAeI9xOzb
+KsbO/Q7VBdzaH75dVrc+dSQqXy1bOQUAext9foXlso8ECt0b1vQVdspe5tQ1+y3u
+aDG4T0gWjN5P3enk6TN3v4V9UaBA4J1DkBCxC/RNFnNZc22GqQ1Bbf9rKXjyXECp
+q1AZvg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldap-dariah.esc.rzg.mpg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.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">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Haase</SurName>
+    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Peter</GivenName>
+    <SurName>Gietz</SurName>
+    <EmailAddress>mailto:peter.gietz@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>DARIAH</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:info@de.dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
index 286b18e6..bc0847bf 100644
--- a/swamid-interfederations-2.0/login-idp.auth.gr.xml
+++ b/swamid-interfederations-2.0/login-idp.auth.gr.xml
@@ -56,6 +56,50 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIGmTCCBYGgAwIBAgIIEpesHsDp050wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
+                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
+                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
+                            NDA3MDAwMDAwWhcNMTYwNDA2MDQxMjA3WjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
+                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSQ4x6t
+                            XTCDG7qOrPzabp0Z3H998X+MxjlY8ClW3YhjmExFPREEqJxhJPesLJlX9va+rBE9
+                            zfhr6HXExNSeMfrTTx3/dYG8VFP8AeSbZ+a3AKwQ2j+TqJTGa87CCbFExN7wYxBV
+                            jT2DwT9AtqNpCWPqvBpws+6rtzaaZbxkdN2zxBp+9BAXUy70ZUY2XyZLey26LVw6
+                            M1DRlqJTxMJzSXhIN9VDAW+mBTfwUItCtDU1qlMzCb8cF5Z64WuUHlZ2gxVt+bCM
+                            0txDwHsmaJsX3kmMNgxZIJfYMUy0+fnkXsheUF21fdscfbwH0Z06OkWVkRGsDA+S
+                            QuN/j3mFCTOrSKUCAwEAAaOCAwUwggMBMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQD
+                            AgWgMDsGA1UdJQQ0MDIGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsG
+                            AQUFBwMGBggrBgEFBQcDBzAdBgNVHQ4EFgQUJBBlBSvj16AfytJXxcQCnhbIwsEw
+                            HwYDVR0jBBgwFoAU9ZMXSh1ztn9/ILKlFJRXchkzNtIwcQYIKwYBBQUHAQEEZTBj
+                            MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjA8BggrBgEFBQcw
+                            AoYwaHR0cDovL3d3dy5wa2kuYXV0aC5nci9jZXJ0cy9BdXRoQ2VudHJhbENBUjQu
+                            cGVtMEcGA1UdHwRAMD4wPKA6oDiGNmh0dHA6Ly9jcmx2MS5wa2kuYXV0aC5nci9B
+                            dXRoQ2VudHJhbENBUjQvY3JsdjEuZGVyLmNybDCCASAGA1UdIASCARcwggETMIIB
+                            DwYLKwYBBAG8HQIAAwUwgf8wNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1
+                            dGguZ3IvZG9jdW1lbnRzL0NQUy5waHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0
+                            b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0
+                            aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRo
+                            aXMgQ2VydGlmaWNhdGUgbXVzdCBvbmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCBy
+                            ZXNlYXJjaCBvciBlZHVjYXRpb25hbCBwdXJwb3Nlcy4wgYYGA1UdEQR/MH2CEWxv
+                            Z2luLWlkcC5hdXRoLmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRw
+                            MS5pdC5hdXRoLmdyghBsb2dpbi1pZHAxLml0LmdyghVsb2dpbi1pZHAyLml0LmF1
+                            dGguZ3KCEmxvZ2luLWlkcDIuYXV0aC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAgzAL
+                            I1gI5/zOFbX6mMd46r6HcZQ2y+41uqe9achTBo8ycAe3jA5dHwL+dqjN0uFdOBNJ
+                            Le3vKPVghDqLw9dH52fxN6QTZnASfsSwkOy/uDAet4fh1c21U/I0V9Rg1Us4cQEG
+                            XM4jJ4mKcqIFibLGUWPfB94PLrNaQWVTVIKvsdkh/KLnmVUzKk5U9dMBerOflaT4
+                            atG51Hc+xpew/M93F2l2D0Vr+3LT6/BCA4WvCq3Ey1ZRBmdYMlADdkMskfAuD7GL
+                            pGQ/TY7ZLImfjwUXTBODgqfbj9Dv4EegfY9HLhT/yVckllXZhK05fTgi/BCkgXAb
+                            AzqiLvGn8wTWlVZYZA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -111,6 +155,50 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIGmTCCBYGgAwIBAgIIEpesHsDp050wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNV
+                            BAYTAkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2gg
+                            SW5zdGl0dXRpb25zIENlcnQuIEF1dGhvcml0eTE7MDkGA1UEAxMyQXJpc3RvdGxl
+                            IFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpIENlbnRyYWwgQ0EgUjQwHhcNMTQw
+                            NDA3MDAwMDAwWhcNMTYwNDA2MDQxMjA3WjB/MQswCQYDVQQGEwJHUjEtMCsGA1UE
+                            ChMkQXJpc3RvdGxlIFVuaXZlcnNpdHkgb2YgVGhlc3NhbG9uaWtpMRIwEAYDVQQL
+                            EwlJVCBDZW50ZXIxLTArBgNVBAMTJElkZW50aXR5IFByb3ZpZGVyIGZvciBzaW5n
+                            bGUtc2lnbi1vbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSQ4x6t
+                            XTCDG7qOrPzabp0Z3H998X+MxjlY8ClW3YhjmExFPREEqJxhJPesLJlX9va+rBE9
+                            zfhr6HXExNSeMfrTTx3/dYG8VFP8AeSbZ+a3AKwQ2j+TqJTGa87CCbFExN7wYxBV
+                            jT2DwT9AtqNpCWPqvBpws+6rtzaaZbxkdN2zxBp+9BAXUy70ZUY2XyZLey26LVw6
+                            M1DRlqJTxMJzSXhIN9VDAW+mBTfwUItCtDU1qlMzCb8cF5Z64WuUHlZ2gxVt+bCM
+                            0txDwHsmaJsX3kmMNgxZIJfYMUy0+fnkXsheUF21fdscfbwH0Z06OkWVkRGsDA+S
+                            QuN/j3mFCTOrSKUCAwEAAaOCAwUwggMBMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQD
+                            AgWgMDsGA1UdJQQ0MDIGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsG
+                            AQUFBwMGBggrBgEFBQcDBzAdBgNVHQ4EFgQUJBBlBSvj16AfytJXxcQCnhbIwsEw
+                            HwYDVR0jBBgwFoAU9ZMXSh1ztn9/ILKlFJRXchkzNtIwcQYIKwYBBQUHAQEEZTBj
+                            MCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjA8BggrBgEFBQcw
+                            AoYwaHR0cDovL3d3dy5wa2kuYXV0aC5nci9jZXJ0cy9BdXRoQ2VudHJhbENBUjQu
+                            cGVtMEcGA1UdHwRAMD4wPKA6oDiGNmh0dHA6Ly9jcmx2MS5wa2kuYXV0aC5nci9B
+                            dXRoQ2VudHJhbENBUjQvY3JsdjEuZGVyLmNybDCCASAGA1UdIASCARcwggETMIIB
+                            DwYLKwYBBAG8HQIAAwUwgf8wNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1
+                            dGguZ3IvZG9jdW1lbnRzL0NQUy5waHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0
+                            b3RsZSBVbml2ZXJzaXR5IG9mIFRoZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0
+                            aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRo
+                            aXMgQ2VydGlmaWNhdGUgbXVzdCBvbmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCBy
+                            ZXNlYXJjaCBvciBlZHVjYXRpb25hbCBwdXJwb3Nlcy4wgYYGA1UdEQR/MH2CEWxv
+                            Z2luLWlkcC5hdXRoLmdyghRsb2dpbi1pZHAuaXQuYXV0aC5ncoIVbG9naW4taWRw
+                            MS5pdC5hdXRoLmdyghBsb2dpbi1pZHAxLml0LmdyghVsb2dpbi1pZHAyLml0LmF1
+                            dGguZ3KCEmxvZ2luLWlkcDIuYXV0aC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAgzAL
+                            I1gI5/zOFbX6mMd46r6HcZQ2y+41uqe9achTBo8ycAe3jA5dHwL+dqjN0uFdOBNJ
+                            Le3vKPVghDqLw9dH52fxN6QTZnASfsSwkOy/uDAet4fh1c21U/I0V9Rg1Us4cQEG
+                            XM4jJ4mKcqIFibLGUWPfB94PLrNaQWVTVIKvsdkh/KLnmVUzKk5U9dMBerOflaT4
+                            atG51Hc+xpew/M93F2l2D0Vr+3LT6/BCA4WvCq3Ey1ZRBmdYMlADdkMskfAuD7GL
+                            pGQ/TY7ZLImfjwUXTBODgqfbj9Dv4EegfY9HLhT/yVckllXZhK05fTgi/BCkgXAb
+                            AzqiLvGn8wTWlVZYZA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
index 74e33b83..9e1e4711 100644
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
@@ -1,7 +1,7 @@
 <?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-04-07T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-28T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
index 6650ca1d..149e3079 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
@@ -16,49 +16,67 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irnet.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Athena - Research and Innovation Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.athena-innovation.gr/en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">http://www.athena-innovation.gr/el.html</mdui:InformationURL>
+        <mdui:Logo height="90" width="73">https://login.athena-innovation.gr/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>imis.athena-innovation.gr</mdui:DomainHint>
+        <mdui:DomainHint>ilsp.gr</mdui:DomainHint>
+        <mdui:DomainHint>ceti.gr</mdui:DomainHint>
+        <mdui:DomainHint>isi.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.63.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.3.0/24</mdui:IPHint>
+        <mdui:IPHint>195.251.58.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.192.0/24</mdui:IPHint>
+        <mdui:IPHint>194.177.217.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2600::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:38.0365046,23.802512</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
+                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
@@ -70,49 +88,46 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imis.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilsp.athena-innovation.gr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceti.athena-innovation.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irnet.athena-innovation.gr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isi.athena-innovation.gr</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
+                            MIIEmzCCA4OgAwIBAgIQTEvhgWFGJLdkM4ZD5wBQTDANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowSDEhMB8GA1UE
+                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpsb2dpbi5hdGhl
+                            bmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AKaZpSw3Pb3kDBhJzRXUcnUqFZqJSoLjvSMHnxt0GDjBsvmQZwDflsuIu5nbXQ86
+                            DnK7ImdQszT42hal7RFODHrD9F1TC/7zoQRd5DoLnHdKOeHQRAa2WF+IwkrtiyQT
+                            gMhswaqal8wXr7sM+f0bDOYvU3Q2MVdAmE1TefrlPx90hHys+SbreRjj/HUCCsBI
+                            zgfnFcy56Mmr0m9Olbh56VhAs+qZhYpWDyGhuHaRaNEhuJCx0R7IZmFhNGZ/+2+s
+                            CdK1j/hq08c1L7wON/ZDdSBGbM5cuCoxPqIcLyyEgEh4ieo/c8e04ZfxwBFU9XZI
+                            ApX4niHSErzC/bNDMWR+f3kCAwEAAaOCAZEwggGNMB8GA1UdIwQYMBaAFAy9k2gM
+                            896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR0AyJjhZwmKiXLMvyVR6BYE68JYTAO
+                            BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+                            AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+                            OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+                            TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+                            Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+                            aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwPwYDVR0RBDgwNoIabG9naW4uYXRo
+                            ZW5hLWlubm92YXRpb24uZ3KCGGlkcC5hdGhlbmEtaW5ub3ZhdGlvbi5ncjANBgkq
+                            hkiG9w0BAQUFAAOCAQEAA1a3pfD6Iq6rMgZgmJeUEge9y3uLN5YGzJYjsNYvznhZ
+                            tnfuKighFcdQwH/Ph/ceZYtwcIMXstZFxXsFM878PiEehLSghYJorC0e9EDszIsc
+                            QgbzraX/vEjWRZ4ywQU1nsc1+3EYZyIfxmi35FiT8g0xSEVpSj4O1RoDO3xUz8NJ
+                            zDycQMlH2qMDDNdgYGqs/U3habyE1MeAHbz6zWhX6Sa1oeIy6gijvGUUadDULhX3
+                            iVNxJAYr4coKFN/Xj58Ay6JjomJCgmve/lnkdQRuvAZFcu7UiGJfDpBiJNr1Qyzp
+                            bH/fFKDIDSjRobYahs2BQ/SwbEwwA7e0gx0vS/ACwA==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</OrganizationName>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi.xml
index 986ba144..1ea67fec 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi.xml
@@ -1,14 +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:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+<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://login.helsinki.fi/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">helsinki.fi</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
@@ -40,30 +41,30 @@ NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
 Ahw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Peltonen</md:SurName>
-    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Juha</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </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://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName>
+    <OrganizationName xml:lang="en">University of Helsinki</OrganizationName>
+    <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Peltonen</SurName>
+    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Juha</GivenName>
+    <SurName>Niemi</SurName>
+    <EmailAddress>mailto:idm-hosting@helsinki.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org.xml
index d57fb00f..71ce739b 100644
--- a/swamid-interfederations-2.0/monitor.eduroam.org.xml
+++ b/swamid-interfederations-2.0/monitor.eduroam.org.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/module.php/saml/sp/metadata.php/default-sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.aaiedu.hr" registrationInstant="2012-01-01T08:00:00Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
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/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
index 51ed22fd..42229862 100644
--- a/swamid-interfederations-2.0/quod.lib.umich.edu.xml
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
@@ -1,8 +1,5 @@
 <?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">
-  <!--
-		This is a Shibboleth 2 'ACLS Humanities E-Book' SP owned by the University of Michigan.
-	-->
   <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>
diff --git a/swamid-interfederations-2.0/rir.dariah.eu.xml b/swamid-interfederations-2.0/rir.dariah.eu.xml
new file mode 100644
index 00000000..0efbecd5
--- /dev/null
+++ b/swamid-interfederations-2.0/rir.dariah.eu.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rir.dariah.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:20:49Z">
+      <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://rir.dariah.eu/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">RiR Suchportal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">RiR Search Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Relationen im Raum Suchportal</mdui:Description>
+        <mdui:Description xml:lang="en">Relationen im Raum Search Portal</mdui:Description>
+        <mdui:Logo height="48" width="48">https://dev2.dariah.eu/wiki/download/attachments/11468980/RIRPUB</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://dev2.dariah.eu/wiki/display/RIRPUB/RiR</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>rir.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=rir.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIHFzfR3+HryTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMDYxMDU2MTZaFw0xOTAzMDUx
+MDU2MTZaMIGBMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRYwFAYDVQQDEw1yaXIuZGFyaWFoLmV1MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyyqlVXHDU7q2tfzvU/H9hzwLJgQ2
+zL9lU7xuTatNw6xZf/ur1KzoVobA0Pi3v5Z112fgi9fz/zbniyJSk5aH+1aWv3hF
+cR1HPscdsh3vWD9XSCon/hHtwVJqJyUFNSXeNRQglvJh/KC2mxH9rx4ipzux7uM/
+jZf8pCIHKys7BxDb7Y3mhSesPg6ZX+LeLEDCEqQilyyXp+x/+4unmE4AiFDv3o4N
+/HO9eiu+9pujU/iuF4wh/xe0AMYr0TbuUZK/kNePYuYrexhkbXRJ07215WPVUFIa
+2MJ5s0RZyKY1Swcmk8A58jzP+Tuobb2OM7025qxccHtpS5oE/9ugTX3lwwIDAQAB
+o4ICQjCCAj4wOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
+rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFPJVqHGmkxAqwrbD
+qS4U0CRl+hYCMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzrMBgGA1Ud
+EQQRMA+CDXJpci5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
+bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
+bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBWY1r2RQTMoizuMgCy9rtmqgMT1UzZ
+t9CgpUi0mE5n3v84kKLIU//R70xxNwiWvdjXVCyfwSYYPXnIQZsWH+m5f4xz+h/j
+Kh/j8DjAqucHpK2i8RA7QwiPNF7mesX/HzqGrUKDXXkAGXfHBxv7Nia5k/0f7Dsj
+oLD9C/n5AhDtBEBlw31Od3Lb624xDXOg4xLVn/I+egQWN0bu7ZbXLN3LFzFdNLMK
+TuWnKD0bEWbEYRR2MCx7Md1fKW7MlgMC6jFqpHlZAfb4GVWHdIW6DU/TaxM0KJ7V
+V88S++4/7Dd9Tp/NAtNfdv/hkVRV5yNyM5mIA3eYyrnr6RualuszsdzI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">RiR Suchportal</ServiceName>
+      <ServiceName xml:lang="en">RiR Search Portal</ServiceName>
+      <ServiceDescription xml:lang="de">Relationen im Raum Suchportal</ServiceDescription>
+      <ServiceDescription xml:lang="en">Relationen im Raum Search 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">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>Tamim</GivenName>
+    <SurName>Ziai</SurName>
+    <EmailAddress>mailto:tamim.ziai@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
index 8a86f7c0..a2584668 100644
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
@@ -15,8 +15,8 @@
         <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:InformationURL xml:lang="en">http://www.ifs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifs.edu.br</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
@@ -102,8 +102,8 @@ DZqccZQCmzfE8nJworc=
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifs.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifs.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Joao Silvio</SurName>
diff --git a/swamid-interfederations-2.0/ross.impa.br.xml b/swamid-interfederations-2.0/ross.impa.br.xml
index a25190fc..149d9622 100644
--- a/swamid-interfederations-2.0/ross.impa.br.xml
+++ b/swamid-interfederations-2.0/ross.impa.br.xml
@@ -24,21 +24,21 @@
         <ds:X509Data>
           <ds:X509Certificate>
     MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
-DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDQwOTE2NDEzMloX
+DTE5MDQwODE2NDEzMlowMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
 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
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAJAeBE
+/EyeWED6UkuhWLEW285gvSKjjFTVuhWLYvAzx4A0OtFLI7ZLw4Bsqrxf/yBGKK/G
+WWBL+ZTWXyL7HeiegGQdYUZxhfRvSN2qoMhU640EmfYkhvrR1Wvg/AyROdbI0Dhy
+7cRome00Rbxg0FybCP3QkWv2BYVb1Y9VL2mndRotr3tqOKmNoErveXUgeckqM/x1
+Bm3wud/MnqBDAOgU3e+IPOzkFYFPo2l4r1KaqQFyAyv4hsZoMHMZYOhye2lVTzp/
++ad4ZSLQCwNXcPiXoeXm6MKAQjGLb+9zXtxOpm0NYPmTs2ynEhj5tR8OttA3rP6o
+4He60DRLixet6KjP
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -62,21 +62,21 @@ BQbIol8hjh2qNA/n
           <ds:X509Certificate>
       
 MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
-DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDQwOTE2NDEzMloX
+DTE5MDQwODE2NDEzMlowMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
 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
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAJAeBE
+/EyeWED6UkuhWLEW285gvSKjjFTVuhWLYvAzx4A0OtFLI7ZLw4Bsqrxf/yBGKK/G
+WWBL+ZTWXyL7HeiegGQdYUZxhfRvSN2qoMhU640EmfYkhvrR1Wvg/AyROdbI0Dhy
+7cRome00Rbxg0FybCP3QkWv2BYVb1Y9VL2mndRotr3tqOKmNoErveXUgeckqM/x1
+Bm3wud/MnqBDAOgU3e+IPOzkFYFPo2l4r1KaqQFyAyv4hsZoMHMZYOhye2lVTzp/
++ad4ZSLQCwNXcPiXoeXm6MKAQjGLb+9zXtxOpm0NYPmTs2ynEhj5tR8OttA3rP6o
+4He60DRLixet6KjP
                     
             </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 e4a6eda8..60aecece 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="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</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>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
@@ -52,104 +58,104 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
 7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kari</md:GivenName>
-    <md:SurName>Laalo</md:SurName>
-    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </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/rtrvirshib.ifmt.edu.br.xml b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
index 349b2cdb..4729be33 100644
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
+++ b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
@@ -23,27 +23,26 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xMTEwMjcxNjUwMTZaFw0xNDEwMjYxNjUwMTZaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ4ICN6U2M/If/rw6RQ0Dt5kXYR13WxoDnAve5hW7u
-wXf4l4n9Wcu2HigGH8AS+g/oauJt8q72QveVrSPcz3ZjRHnS39T+h6xaU/nvWWa2
-3+S0ZyuNewYX//0S6Q5U6E3nyQwX0PZkDG8TahOuWbCvNmTdl3EB2ZjgHFyF8maz
-wQf2iwJ+JgKQhj/uVzbDdf04wTrsO+D1n7kQX4q9izyaS54xCHtrOtdce1zEbxFK
-lmxo5HNrqZx4Dmew8ulenT9+vquPjsRnQsdl0TviMYB2oxiF4vCEfQGqUJ02tT4b
-YOGuwdcwr8BcWJoH06W4R7w5+vjVPGcBesSTADoIqU6FAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAHpQaEcKjErhZQWehDlHiXyZY9OG5UkBDz2pEazAudp+MxmkaIiL
-yKVnAjnr8L6c47UimSRgYkFEFMsXa7IqHFM60J5mSTeT6ZqOaA3Nu3sw5HNuBGE0
-ilqZecmTz5gtG9hTGdGUFxY5Yg/Vni5EhPHWJp6nZHhZTSkiafvT0JZGgm87sQ1e
-2kZWW1qdDaR88DYbg8kLGdf7cGZ024fQw2h62lFEJ7O0e8X5oxPdUqY7HScKHXZK
-2UKA5PYFRjyp4MOi8tPTjpI1YQ9mmFzaIAdh3aUPh8zuJoH21YtVxo8aGhms93ab
-BWahGDWbniRTLwLRC1Jq14E6Ld0cLn79Sxo=
+    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
+BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
+BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
+MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
+N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
+VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
+aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
+ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
+th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
+F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
+kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
+eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
+XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
+xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
+DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
+JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
+vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
+mmlVzkmXDVDPlyf/vhWQDReo
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,27 +65,26 @@ BWahGDWbniRTLwLRC1Jq14E6Ld0cLn79Sxo=
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xMTEwMjcxNjUwMTZaFw0xNDEwMjYxNjUwMTZaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ4ICN6U2M/If/rw6RQ0Dt5kXYR13WxoDnAve5hW7u
-wXf4l4n9Wcu2HigGH8AS+g/oauJt8q72QveVrSPcz3ZjRHnS39T+h6xaU/nvWWa2
-3+S0ZyuNewYX//0S6Q5U6E3nyQwX0PZkDG8TahOuWbCvNmTdl3EB2ZjgHFyF8maz
-wQf2iwJ+JgKQhj/uVzbDdf04wTrsO+D1n7kQX4q9izyaS54xCHtrOtdce1zEbxFK
-lmxo5HNrqZx4Dmew8ulenT9+vquPjsRnQsdl0TviMYB2oxiF4vCEfQGqUJ02tT4b
-YOGuwdcwr8BcWJoH06W4R7w5+vjVPGcBesSTADoIqU6FAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAHpQaEcKjErhZQWehDlHiXyZY9OG5UkBDz2pEazAudp+MxmkaIiL
-yKVnAjnr8L6c47UimSRgYkFEFMsXa7IqHFM60J5mSTeT6ZqOaA3Nu3sw5HNuBGE0
-ilqZecmTz5gtG9hTGdGUFxY5Yg/Vni5EhPHWJp6nZHhZTSkiafvT0JZGgm87sQ1e
-2kZWW1qdDaR88DYbg8kLGdf7cGZ024fQw2h62lFEJ7O0e8X5oxPdUqY7HScKHXZK
-2UKA5PYFRjyp4MOi8tPTjpI1YQ9mmFzaIAdh3aUPh8zuJoH21YtVxo8aGhms93ab
-BWahGDWbniRTLwLRC1Jq14E6Ld0cLn79Sxo=
+MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
+BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
+BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
+MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
+N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
+VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
+aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
+ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
+th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
+F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
+kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
+eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
+XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
+xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
+DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
+JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
+vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
+mmlVzkmXDVDPlyf/vhWQDReo
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
new file mode 100644
index 00000000..ff66577c
--- /dev/null
+++ b/swamid-interfederations-2.0/sau09ret.ifbaiano.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://sau09ret.ifbaiano.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">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFBaiano - Instituto Federal Baiano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifbaiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifbaiano.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
+KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
+ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
+cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
+MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
+aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
+bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
+uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
+reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
+WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
+LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
+yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
+A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
+FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
+0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
+KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
+zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.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>
+      
+MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxLDAqBgNVBAoTI0lGQmFpYW5v
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgQmFpYW5vMQ0wCwYDVQQLEwRER1RJMSQwIgYJ
+KoZIhvcNAQkBFhVjb3RlY0BpZmJhaWFuby5lZHUuYnIxETAPBgNVBAcTCFNhbHZh
+ZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGHNhdTA5
+cmV0LmlmYmFpYW5vLmVkdS5icjAeFw0xNDA0MTQyMjU4MThaFw0xNzA0MTMyMjU4
+MThaMIG2MSwwKgYDVQQKEyNJRkJhaWFubyAtIEluc3RpdHV0byBGZWRlcmFsIEJh
+aWFubzENMAsGA1UECxMEREdUSTEkMCIGCSqGSIb3DQEJARYVY290ZWNAaWZiYWlh
+bm8uZWR1LmJyMREwDwYDVQQHEwhTYWx2YWRvcjEOMAwGA1UECBMFQmFoaWExCzAJ
+BgNVBAYTAkJSMSEwHwYDVQQDExhzYXUwOXJldC5pZmJhaWFuby5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5ijX0kBu2O+XuV9a01EvCeTof
+uSU2K6jzaX5id9jZB0XcsYFo548SFE5qtzIwuWtN5VmdIKdCCycuvY84ON+WbX+D
+reNAq04e+OfS1tf9KSLwfSvIl1+D4IJvx8ul7U8SPEmd3oxLxdwM6XA1Yz1G2ejh
+WxAZtJB4uAX8y+tXwIjMIFldf2oY0sGTnC7c8CtOu/XmDTo1F8rKm+kbqvehueQO
+LodkLDH/ZwFgoEt+eCEDo2lA9B5saYJk7/8i/zW4M/sHgVLew3+mLHlhzeIjpqLj
+yNsYFFnPECAufWsr8c8e0Dc5WmKEQEXXHnIve3Z/JeNqAyMxP0yCYj/IWpzxAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIkge9KkVX+lKhFX4QRd6CvNcpXOhVy2W2nt
+A3lLpsleXQD7OOSMGQFT3t0+oddMeOffBZDe5wpZx9jONf+rnnt8nYMBkollvrds
+FY0/KoGApJQfHXBPr+RO1K4eWCllKRSyjuEMCqXM2+jLEVdGa2j3cLVI3tJ69jga
+0hrCLIV6907qSEx/YjUHPazugxLpgiJMl83TdxmbU1K9/XwC27A0xsx6DZEXS1Cu
+KvM7Bvwx6NC1trrrHXoIC8WaSeKyhFAIJ9+q5R0er2tgB1Ylp4iWYJWITk6o2ISg
+zkWv3/eC022LBCTsChUgn2q+prZSfMLrYHDJyYbyhsHewnxgzwk=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.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">IFBaiano - Instituto Federal Baiano</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifbaiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifbaiano.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Humberto Santiago</SurName>
+    <EmailAddress>cotec@ifbaiano.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu.xml b/swamid-interfederations-2.0/search.de.dariah.eu.xml
new file mode 100644
index 00000000..35e5d35b
--- /dev/null
+++ b/swamid-interfederations-2.0/search.de.dariah.eu.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/search">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:21:53Z">
+      <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://search.de.dariah.eu/search/saml/login/alias/search?disco=true" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Generic Search</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Generic Search</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Generic Search</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Generic Search</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
+Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
+VJ2CRsza
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
+Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
+VJ2CRsza
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">DARIAH Generic Search</ServiceName>
+      <ServiceName xml:lang="en">DARIAH Generic Search</ServiceName>
+      <ServiceDescription xml:lang="de">DARIAH Generic Search</ServiceDescription>
+      <ServiceDescription xml:lang="en">DARIAH Generic Search</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>Gradl</SurName>
+    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
index 23f86149..9e05635a 100644
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
@@ -22,39 +22,41 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEqpQbkSDdTANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
+          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
 EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
 MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTExMDA0MDkzMzE5WhcNMTYxMDAyMDkzMzE5WjCBhjELMAkGA1UEBhMCREUx
-KDAmBgNVBAoTH0h1bWJvbGR0LVVuaXZlcnNpdGFldCB6dSBCZXJsaW4xJzAlBgNV
-BAsTHlpFIENvbXB1dGVyLSB1bmQgTWVkaWVuc2VydmljZTEkMCIGA1UEAxMbc2hp
-YmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0vBDQzp17iY3EpgON9nw4NprsoHn0GtfkzmL2t1yYRW5U67hdMNg
-trTQ2OHpD5Yzk2zi88L1y0aRBIsWV/DvvPM+k3NkUKfD5hDrPogHphvUvjIvJG4A
-3oDpb4Tx7TmF1ZBe1M2+xeQ+MhaUrbM8JDcRdgtScgWrEp3qkLY/xMRjVsv6sPbw
-3m3BS2Kayg7Y11d0HCuPYXM8c6dtOSNNKAUYA1IG8FkhtAEVo86goCGETYLQxGLb
-CXfeNg7G8jrKa8NUN0+mOdnpvBX7jSVGSKTYsH3C8QPkMEkYOBCq++WoCDQGIF34
-zAH3QjlIvD6KGKfwFASbV6Q+6jvI1PqG2QIDAQABo4ICWzCCAlcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBRgpVpqIZHoHu6A3wNr8YHGwX0chjAfBgNVHSMEGDAWgBQf9Sw+90Cr
-LpCgatPieV7yds2DdDCBtgYDVR0RBIGuMIGrghhzaGliLWRzLmNtcy5odS1iZXJs
-aW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMu
-Y21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5k
-ZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlgRZzaGliYWRtaW5AaHUtYmVy
-bGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgZ4G
-CCsGAQUFBwEBBIGRMIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2h1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUH
-MAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABeQzv7HU+e81io7Uh6Ux
-88a61i75dPU+gPsGutyrSj8BGpuYB55gt5Huv95uLXM7XlY4/MzElucvyLdr0nan
-9wO7HpNYVoYfcM2+BT/gD8tQrAPYf49c7vNXN6f4+DAUC66oAMR+6F2tHybAupoE
-qLGnBMAzaKgp9QibCCJb6PnpY6iLNHRMFYFyoYAsST3A8TvEp5o/ga1wziqlWR5U
-63trGi6EXf/TWfqjRVl/vIbqKjJGlXexNaxXUHJmApPMa/J83PE/GZD9nvdYqfli
-XElaOsRM2A6AOAMlKljXc1i3ZeMFMmr5+yOET0AouaSMjgKNn6oBUnf8U34udgZg
-MQ==
+HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
+b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
+ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
+LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
+e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
+ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
+/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
+W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
+rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
+GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
+LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
+atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
+ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
+Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
+c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
+cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
+BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
+mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
+YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
+Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
+yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
+lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -79,39 +81,41 @@ MQ==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>shibboleth.uvf.hu-berlin.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEqpQbkSDdTANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
+          <ds:X509SubjectName>CN=shibboleth.uvf.hu-berlin.de,OU=ZE Computer- und Medienservice,O=Humboldt-Universitaet zu Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGRzCCBS+gAwIBAgIHF2Z6KgngwzANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
 EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
 MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTExMDA0MDkzMzE5WhcNMTYxMDAyMDkzMzE5WjCBhjELMAkGA1UEBhMCREUx
-KDAmBgNVBAoTH0h1bWJvbGR0LVVuaXZlcnNpdGFldCB6dSBCZXJsaW4xJzAlBgNV
-BAsTHlpFIENvbXB1dGVyLSB1bmQgTWVkaWVuc2VydmljZTEkMCIGA1UEAxMbc2hp
-YmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0vBDQzp17iY3EpgON9nw4NprsoHn0GtfkzmL2t1yYRW5U67hdMNg
-trTQ2OHpD5Yzk2zi88L1y0aRBIsWV/DvvPM+k3NkUKfD5hDrPogHphvUvjIvJG4A
-3oDpb4Tx7TmF1ZBe1M2+xeQ+MhaUrbM8JDcRdgtScgWrEp3qkLY/xMRjVsv6sPbw
-3m3BS2Kayg7Y11d0HCuPYXM8c6dtOSNNKAUYA1IG8FkhtAEVo86goCGETYLQxGLb
-CXfeNg7G8jrKa8NUN0+mOdnpvBX7jSVGSKTYsH3C8QPkMEkYOBCq++WoCDQGIF34
-zAH3QjlIvD6KGKfwFASbV6Q+6jvI1PqG2QIDAQABo4ICWzCCAlcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBRgpVpqIZHoHu6A3wNr8YHGwX0chjAfBgNVHSMEGDAWgBQf9Sw+90Cr
-LpCgatPieV7yds2DdDCBtgYDVR0RBIGuMIGrghhzaGliLWRzLmNtcy5odS1iZXJs
-aW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMu
-Y21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5k
-ZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlgRZzaGliYWRtaW5AaHUtYmVy
-bGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgZ4G
-CCsGAQUFBwEBBIGRMIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2h1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUH
-MAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABeQzv7HU+e81io7Uh6Ux
-88a61i75dPU+gPsGutyrSj8BGpuYB55gt5Huv95uLXM7XlY4/MzElucvyLdr0nan
-9wO7HpNYVoYfcM2+BT/gD8tQrAPYf49c7vNXN6f4+DAUC66oAMR+6F2tHybAupoE
-qLGnBMAzaKgp9QibCCJb6PnpY6iLNHRMFYFyoYAsST3A8TvEp5o/ga1wziqlWR5U
-63trGi6EXf/TWfqjRVl/vIbqKjJGlXexNaxXUHJmApPMa/J83PE/GZD9nvdYqfli
-XElaOsRM2A6AOAMlKljXc1i3ZeMFMmr5+yOET0AouaSMjgKNn6oBUnf8U34udgZg
-MQ==
+HhcNMTQwNDEwMjAxODM1WhcNMTkwNDA5MjAxODM1WjCBqDELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSgwJgYDVQQKEx9IdW1i
+b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLEx5aRSBDb21wdXRl
+ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMTG3NoaWJib2xldGgudXZmLmh1
+LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
+e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
+ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
+/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
+W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
+rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
+GhE5XKlUKdtKKNcCAwEAAaOCArMwggKvMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGC
+LAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAWgBQf9Sw+90CrLpCg
+atPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNtcy5odS1iZXJsaW4u
+ZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMuY21z
+Lmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5kZYIb
+c2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2Ev
+cHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzAB
+hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYB
+BQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3
+DQEBBQUAA4IBAQCzPNgkjA6fa1I4Jmz8jK7uUBK3GJyauJ5ADHqc4ljsvoOjrKzT
+mT4gIy1XVKjsYWVID9anOnqd21EHJ82XNf2UKKmiVc1CIMz50VP5TCFqPr+a3LPy
+YeKN8H82ZHVCuQr1PpCeGDNewdyAWgOWrGGMvvZkYmGskvc3epkKfxG8T/HyueHh
+Moe3fU74QPZ/65iFysiDuK+9lqlT7VRp0FC61qhlPOjZPNcjMYeOXa4zS7hq4NYT
+yc3mkCS1I4050gDzdhTX9WbjFlGXZ1Eyu1ZPMcO9ebA1xXBbvbShAyKREaEl7UoS
+lp8Ny4TYeDIkRYSv+DuzIcJCFhAY//i8BXS8
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
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.ifgoiano.edu.br.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
index e77601ad..b35c3fb0 100644
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
@@ -23,28 +23,29 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMQ4wDAYDVQQLEwVDR0dUSTEwMC4G
-CSqGSIb3DQEJARYhZnJlZGVyaWNvLnBlcmVpcmFAaWZnb2lhbm8uZWR1LmJyMREw
-DwYDVQQHFAhHb2nDom5pYTEPMA0GA1UECBQGR29pw6FzMQswCQYDVQQGEwJCUjEd
-MBsGA1UEAxMUc2hpYi5pZmdvaWFuby5lZHUuYnIwHhcNMTQwMzI1MjAyODQ1WhcN
-MTcwMzI0MjAyODQ1WjCBwDEsMCoGA1UEChMjSUZHT0lBTk8gLSBJbnN0aXR1dG8g
-RmVkZXJhbCBHb2lhbm8xDjAMBgNVBAsTBUNHR1RJMTAwLgYJKoZIhvcNAQkBFiFm
-cmVkZXJpY28ucGVyZWlyYUBpZmdvaWFuby5lZHUuYnIxETAPBgNVBAcUCEdvacOi
-bmlhMQ8wDQYDVQQIFAZHb2nDoXMxCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRzaGli
-LmlmZ29pYW5vLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKtnoDYsytvb71C9AuCI7vZIekSeDhN0I3DR2GYfiZgIvsm/NROQhfP3YQUEWfDa
-qqew36aoqXw/T/KVlKNRbCngJoH2BlK9IMGF2H0F+xOXzo0i3mXoIuSej2LO1L3h
-UZXuFiJQ+eQj+RESFWdEFhRJ0lxQF9/sadWW+y9AgEpcYItlLpzeY46SVkltuwNq
-1MKN0D6CSj7wS4dLUkweVQALjv5LB1Cyw7wxpQ3Vqw0QA18UApxSkawGGH5JZ5xo
-3oLvDDcdWzE8Vx3XrmWRJls3rPhWf2qGWNv77jRrJjbx4aFE4k/gSUQ7JBCAie4C
-01vYlhIPrQqV9sLhKqh6pEMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgInznm3t
-M6qc3eoGMnQlpjY6YMMwAduth1tbm6oIqSfJpi/B69MyEQKl2PWkkLuUoC/sVIYJ
-6quo/xjGqDPmcvMijwUxHZRFixN57mtEZ8N+DVcnEyYGfJr0JfTXkUnI3N+EwO21
-CRjwe1ficrxBtG+V/T5UBaocCYSZyby3df+ybykJ1ZI5KJYWhS6yuM25FXFmXHdb
-PTGur/vB7Wrhpy5/v64q0qKi/3HOqQm2p1ll4gtIo4LS5K7EL+M0tsTqrfl0liES
-XEB82gPXyPYLpdN+HEHrIKMSZZUtwftGadfu8eFw7H21glfO1ESCccx5wJbZBm5z
-NGJ8ppVVt/dkrQ==
+    MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
+ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
+KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
+aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
+aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
+geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
+MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
+ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
+dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
+BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
+Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
+fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
+L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
+DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
+NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
+VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
++Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
+m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
+0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
+t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,29 +68,29 @@ NGJ8ppVVt/dkrQ==
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxLDAqBgNVBAoTI0lGR09JQU5P
-IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMQ4wDAYDVQQLEwVDR0dUSTEwMC4G
-CSqGSIb3DQEJARYhZnJlZGVyaWNvLnBlcmVpcmFAaWZnb2lhbm8uZWR1LmJyMREw
-DwYDVQQHFAhHb2nDom5pYTEPMA0GA1UECBQGR29pw6FzMQswCQYDVQQGEwJCUjEd
-MBsGA1UEAxMUc2hpYi5pZmdvaWFuby5lZHUuYnIwHhcNMTQwMzI1MjAyODQ1WhcN
-MTcwMzI0MjAyODQ1WjCBwDEsMCoGA1UEChMjSUZHT0lBTk8gLSBJbnN0aXR1dG8g
-RmVkZXJhbCBHb2lhbm8xDjAMBgNVBAsTBUNHR1RJMTAwLgYJKoZIhvcNAQkBFiFm
-cmVkZXJpY28ucGVyZWlyYUBpZmdvaWFuby5lZHUuYnIxETAPBgNVBAcUCEdvacOi
-bmlhMQ8wDQYDVQQIFAZHb2nDoXMxCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRzaGli
-LmlmZ29pYW5vLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKtnoDYsytvb71C9AuCI7vZIekSeDhN0I3DR2GYfiZgIvsm/NROQhfP3YQUEWfDa
-qqew36aoqXw/T/KVlKNRbCngJoH2BlK9IMGF2H0F+xOXzo0i3mXoIuSej2LO1L3h
-UZXuFiJQ+eQj+RESFWdEFhRJ0lxQF9/sadWW+y9AgEpcYItlLpzeY46SVkltuwNq
-1MKN0D6CSj7wS4dLUkweVQALjv5LB1Cyw7wxpQ3Vqw0QA18UApxSkawGGH5JZ5xo
-3oLvDDcdWzE8Vx3XrmWRJls3rPhWf2qGWNv77jRrJjbx4aFE4k/gSUQ7JBCAie4C
-01vYlhIPrQqV9sLhKqh6pEMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgInznm3t
-M6qc3eoGMnQlpjY6YMMwAduth1tbm6oIqSfJpi/B69MyEQKl2PWkkLuUoC/sVIYJ
-6quo/xjGqDPmcvMijwUxHZRFixN57mtEZ8N+DVcnEyYGfJr0JfTXkUnI3N+EwO21
-CRjwe1ficrxBtG+V/T5UBaocCYSZyby3df+ybykJ1ZI5KJYWhS6yuM25FXFmXHdb
-PTGur/vB7Wrhpy5/v64q0qKi/3HOqQm2p1ll4gtIo4LS5K7EL+M0tsTqrfl0liES
-XEB82gPXyPYLpdN+HEHrIKMSZZUtwftGadfu8eFw7H21glfO1ESCccx5wJbZBm5z
-NGJ8ppVVt/dkrQ==
-
+MIIEOjCCAyICAQAwDQYJKoZIhvcNAQEFBQAwgeIxLDAqBgNVBAoTI0lGR09JQU5P
+IC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5vMT0wOwYDVQQLFDRER1RJIC0gRGly
+ZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSMwIQYJ
+KoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVkdS5icjERMA8GA1UEBxQIR29pw6Ju
+aWExDzANBgNVBAgUBkdvacOhczELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFHNoaWIu
+aWZnb2lhbm8uZWR1LmJyMB4XDTE0MDQxMDIxMDc1MFoXDTE5MDQwOTIxMDc1MFow
+geIxLDAqBgNVBAoTI0lGR09JQU5PIC0gSW5zdGl0dXRvIEZlZGVyYWwgR29pYW5v
+MT0wOwYDVQQLFDRER1RJIC0gRGlyZXRvcmlhIEdlcmFsIGRlIFRlY25vbG9naWEg
+ZGEgSW5mb3JtYcOnw6NvMSMwIQYJKoZIhvcNAQkBFhRkZ3RpQGlmZ29pYW5vLmVk
+dS5icjERMA8GA1UEBxQIR29pw6JuaWExDzANBgNVBAgUBkdvacOhczELMAkGA1UE
+BhMCQlIxHTAbBgNVBAMTFHNoaWIuaWZnb2lhbm8uZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2egNizK29vvUL0C4Iju9kh6RJ4OE3QjcNHY
+Zh+JmAi+yb81E5CF8/dhBQRZ8Nqqp7DfpqipfD9P8pWUo1FsKeAmgfYGUr0gwYXY
+fQX7E5fOjSLeZegi5J6PYs7UveFRle4WIlD55CP5ERIVZ0QWFEnSXFAX3+xp1Zb7
+L0CASlxgi2UunN5jjpJWSW27A2rUwo3QPoJKPvBLh0tSTB5VAAuO/ksHULLDvDGl
+DdWrDRADXxQCnFKRrAYYfklnnGjegu8MNx1bMTxXHdeuZZEmWzes+FZ/aoZY2/vu
+NGsmNvHhoUTiT+BJRDskEICJ7gLTW9iWEg+tCpX2wuEqqHqkQwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQAdb1hHAUd7k8uxZn48i38WEK/EteeVDFnK5rNsSpmXBNQn
+VE2McbYxHWpObBmavcG54nlrjgbKz/O8AHoD+uygRmEm70iyXO8La1SqmEaIppWF
++Aydp01u0EC9VE50ZFYphNpdtKv695D3wvwsQGQ/kV+5xKyHQ8thXD97bVIj9oMR
+m8XXI7eDPZ2s/B0UoEZbvIAy68id7h/EtRyWbYyD8P5TNQ5JUs2I57orOEHfSbTz
+0+MpDn1u65HRka+3/3thgXdHyoyS+kkP9TjNdcnRxhsHpwwB0gvCfFXHS899/zsI
+t4gFfnXOhqI5mhEXE9m9l5n5bX6+LGLBxvNF1Qbt
                     
             </ds:X509Certificate>
         </ds:X509Data>
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.unibo.it.xml b/swamid-interfederations-2.0/shib.unibo.it.xml
new file mode 100644
index 00000000..05ede1cf
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.unibo.it.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </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">unibo.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
+        <mdui:Description xml:lang="en">University of Bologna</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.unibo.it/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unibo.it/idem</mdui:InformationURL>
+        <mdui:Keywords xml:lang="it">unibo bologna alma alma+mater </mdui:Keywords>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://shib.unibo.it/idp/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://shib.unibo.it/idp/img/logo80x60.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>unibo.it</mdui:DomainHint>
+        <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
+        <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
+        <mdui:GeolocationHint>geo:44.497253,11.353107</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.140212,12.24427</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.219036,12.042714</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.413318,12.200308</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:44.061449,12.569894</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+                            BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+                            MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+                            SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+                            PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+                            cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+                            0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+                            K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+                            /Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+                            MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+                            dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+                            DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+                            ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+                            I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+                            vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
+                            tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
+                            WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.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">unibo.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+                            BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+                            MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+                            SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+                            PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+                            cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+                            0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+                            K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+                            /Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+                            MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+                            dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+                            DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+                            ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+                            I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+                            vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
+                            tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
+                            WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Bologna</OrganizationName>
+    <OrganizationName xml:lang="it">Università di Bologna</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Bologna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università di Bologna</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.eng.unibo.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unibo.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>cesia-sso-support@unibo.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
index f4fcca3a..bdd723d3 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
@@ -25,12 +25,12 @@
           <ds:X509Certificate>
     MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
 ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
 ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
 BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
 MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
 VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
 ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
@@ -39,13 +39,13 @@ AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
 RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
 aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
 YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
-X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
-9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
-EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
-b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
-TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
-mnRgIPsxKrrKvirQ
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
+BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
+DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
+j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
+9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
+HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
+qTc5UxmPC7Yhv6hM
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -70,12 +70,12 @@ mnRgIPsxKrrKvirQ
       
 MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
 aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
 ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
 ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+dWZ2LmJyMB4XDTE0MDQxNDExMzc1N1oXDTE5MDQxMzExMzc1N1owgdkxLTArBgNV
 BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGUgSW5mb3JtYWNhbzEZ
 MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
 VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
 ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
@@ -84,14 +84,13 @@ AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
 RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
 aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
 YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
-X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
-9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
-EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
-b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
-TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
-mnRgIPsxKrrKvirQ
-
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCm0AKL
+BmP26xPlCqtrHLg2jUVBieOXLlF9hwc9TT6XQe1oMFHNaYYTEuw6/5To0xBkAWEl
+DrxKfa2qriSd6HBbn33RlWGpkfbMTqI52EgKvq+aUqcHjZfEQIKzdMA+ROIRdNgh
+j5pN94R1x14OARIvBnoYUXTDr/RajPVTs44HPmIKFviSVtkEC0o2pxt44/z1/jcq
+9gDbQO3dHyy+s3Twv7TBBPSECaFM8h3hescyO8I5bU4HJ1SrfjwwOX3jA+f6/U7f
+HGGRxpdKwLluWxlRst23AsG4nQFcIUsisbxQzd0mj29uAfmaQfxGAb+trbAAvZRr
+qTc5UxmPC7Yhv6hM
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml
new file mode 100644
index 00000000..951b1db0
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ifpr.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://shibboleth.ifpr.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">IFPR - Instituto Federal do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPR - Instituto Federal do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPR - Instituto Federal do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpr.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
+hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
+DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
+dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
+sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
+MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
+MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
+UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
+7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
+RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
+l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
+l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
+0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
+oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
+CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
+0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
+kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
+aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.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>
+      
+MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExKzApBgNVBAoTIklGUFIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhbmExDTALBgNVBAsTBERUSUMxITAfBgkq
+hkiG9w0BCQEWEmNpbmZyYUBpZnByLmVkdS5icjERMA8GA1UEBxMIQ3VyaXRpYmEx
+DzANBgNVBAgTBlBhcmFuYTELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xl
+dGguaWZwci5lZHUuYnIwHhcNMTQwNDIyMTgyMTAyWhcNMTcwNDIxMTgyMTAyWjCB
+sTErMCkGA1UEChMiSUZQUiAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBhcmFuYTEN
+MAsGA1UECxMERFRJQzEhMB8GCSqGSIb3DQEJARYSY2luZnJhQGlmcHIuZWR1LmJy
+MREwDwYDVQQHEwhDdXJpdGliYTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJC
+UjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZnByLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL+QMvkPnIAOTQOZTKrQeyHwl1GsqdR5m7+7XhQl
+7GKYJbNwcszmZ755m7uOtz7lmBiI0ZGe77tvcExGPh9lbQiu2IGNLfA2hEtJ4FOA
+RfAATUN6HNtLEEGFxBoG94+E46FdhNVOWUUIlaPVuu9rWbEnY4+rleHEFQ4qveY6
+l1lan5To0CEd4AZEox20EDvtASKR0V+rsgGTGfX7PRnmLFLmbaOj8DkAaYrLdsvC
+l4cA/KspTuSeFO/JSGaZMwZzUlw9znB7KK1oBIas4HQq4JdgqN02mP32E1zYJwm8
+0i/jqijkPrq8vNh97L8itIKB3Z+MEMUc2mimLfbBHu/BrP8CAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUE5Wp5u744Ur0FMDBRSKpsG0mfgBhneFPE5BnLyjKaNKe9wL
+oWvmERcRMKMfXCthEdL7xRjg3PyaCHanuR2KtqiGrKNMtLtBewhqLBoygasNUfeE
+CIjCG+f57fEsd+cqTidaq5uJn3mcKIy/f3cBEesjRvGsTEQQIjrd6pxKqqKNdMPc
+0s9J+ykM0ZPdWusS+IIStc5WEuS3ZrvkwqgInZxvpAobYBxfFIdZeW1pAudK8YHw
+kHoWX9q1+fm3k/1z+W3MvDdC6+WAqEJKWHyMqVQwnzHbwk6Q2jlzQOH9D9n31L6H
+aNQDToC/YZpWymJvQafzCi1CmvvqS5M497IndQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.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">IFPR - Instituto Federal do Parana</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifpr.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jefferson</SurName>
+    <EmailAddress>cinfra@ifpr.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
index 8e1e777c..eab2ef6e 100644
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
@@ -27,8 +27,8 @@
 ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
 EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
 BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
-MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
+MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
 ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
 TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
 EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
@@ -39,12 +39,12 @@ n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
 8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
 HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
 XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAE7H4Lymnax9AUsSmTy3jX/WBL1zJT25XRmpQsTVd2uF
-v4G5edhdtqFSPrFU1ukRYfI9o4HL+pPyU/Y9/DgatOKNjBMHLEyWxvdJWmEGOrig
-mLGQjKFo38ntqmO4Afpho2P7mJl69axfpGhqSl+r7lUco+Xf6POr2kmyEN8Mz3Kv
-LaRkCZkzAKYGYg7jVSfLCo5EsEDnIp6pzSJ9lDZf6IUS8sVYqF8aIBrvj0Lx3kU+
-F3iFKXeAU9TJO7VfLIZZxBflbqzbN+zQ+R2TYWS+dNP14d0sCUkgqCY80BTZuogj
-eWbcB5us/5mwzuuxPbjVQcd62opBc0GpKr5dYzBoKNk=
+KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
+vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
+OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
+aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
+HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
+d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -71,8 +71,8 @@ MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
 ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
 EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
 BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
-MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDA0
+MTAxMjA1NTNaFw0xNzA0MDkxMjA1NTNaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
 ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
 TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
 EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
@@ -83,12 +83,12 @@ n+VL9Jx7xScZ//sl/Jr+IGzRl0TIpcWwJaJcIUfyAqKwkvlyvgB7z/78FYhgE/Fn
 8QNPrLQYmpEaiKGA1WkNe3o9U7t/b6xFgOOkZOhRC2jn8MBN+Kn5eUxH0waQk6ti
 HHZ80rH5ud8C6E0ocpkODEFWx5H2Xn5tU0PUn6RngVUEsqzgkQQbAk3tkRdD7d0g
 XG8NHTP74ocv0ivvv3BBpDDjSHlrYvUq5bV7zdPUXpVVlZGPFI2rAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAE7H4Lymnax9AUsSmTy3jX/WBL1zJT25XRmpQsTVd2uF
-v4G5edhdtqFSPrFU1ukRYfI9o4HL+pPyU/Y9/DgatOKNjBMHLEyWxvdJWmEGOrig
-mLGQjKFo38ntqmO4Afpho2P7mJl69axfpGhqSl+r7lUco+Xf6POr2kmyEN8Mz3Kv
-LaRkCZkzAKYGYg7jVSfLCo5EsEDnIp6pzSJ9lDZf6IUS8sVYqF8aIBrvj0Lx3kU+
-F3iFKXeAU9TJO7VfLIZZxBflbqzbN+zQ+R2TYWS+dNP14d0sCUkgqCY80BTZuogj
-eWbcB5us/5mwzuuxPbjVQcd62opBc0GpKr5dYzBoKNk=
+KoZIhvcNAQEFBQADggEBAH10d5nog6/WojS/rTHB9L6KIwS2btcXXrwgGQymDMOw
+vQKwRXh0lPIpYeIYmsz7aO19HP09KxmEkpJfSbtJ0RAVtYeWvxYdOxRn5B0Tbq9m
+OLQTa+DiCDxNywlFsc5zwJkoeY0LFVVyuL9R+zHC6xjNP4qWN8CuBjY8WtRtXvIr
+aRfk3bQ9jyZLbKyZ5RRLR3PgnM7LyYcRYQ4jWTV/13H8rF4l3VHWo6d+zgkRREeT
+HkC3kRtYLjCoPrY4odcm1Od7hO2o8SJAvgauCF7zFLmNp8vHaxPUdlua9HWf6Xy9
+d08BX8ZFxYA/GMOYSbBNxQEgxZ3aNy76lZ5xR5Te7fo=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br.xml b/swamid-interfederations-2.0/siaiap08.univali.br.xml
index f1f3e57c..0ca3c63b 100644
--- a/swamid-interfederations-2.0/siaiap08.univali.br.xml
+++ b/swamid-interfederations-2.0/siaiap08.univali.br.xml
@@ -23,24 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEFBQAwXjExMC8GA1UECxMoRGVwYXJ0YW1l
-bnRvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwHhcNMTExMDMxMjAxNjA2WhcNMTQx
-MDMwMjAxNjA2WjBeMTEwLwYDVQQLEyhEZXBhcnRhbWVudG8gZGUgVGVjbm9sb2dp
-YSBkYSBJbmZvcm1hY2FvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSPve5D
-Psco2/eYX9R9DiqIIL8DWjxDBgkaG/JPsh70NBQ/VQvLEXiFJhD9e2VrsGbQTeIk
-FmRwkNn2TrE6EjAytZrut5bMPOpQJ3NtvQO29KqJHV6IOId9LSSNLjzYgFoGw72F
-g655GbwWWsB7wkERVZqKV3X/2jc5rMVvo2eb3u1u5bSQsd4CMznPlDYcNoA8fibD
-vxy11mtCAuB3AqfvUQ8isPYPDTQHP/U12/HUok9QXEGEMdPRwxNDeKZ5am2hzLrl
-OrurbGkHC2RaMmoYwtigZVuvj5oGrwJqGhb7zMyuWqhpU1T3f3xrC0aIu4UpBFDP
-Chg44DL0KgOVwkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMSkGCAcfrSqA4SX+
-r/vTJs8yyMMC4y7+QepZ769jUKKOpCQN4SYrm/yRFcCZSXeT3Z/2EDaYdFfwn2fA
-GqObZCHyxXPwM6dn1bDFh9GYHoYG9HAHf3yCeb1J0ZWW884H3twJ4bQDGijOTGLq
-8mACaAeFZ4mMMhA9SboOPplRiy+71wG2Qy0PaRT/jBXFUHBB0NWMDkz9rGHpd5NL
-TZuudxelwa4buucQEmg0MDfeNVkIgSQ8a4Y4AQZRHbrKI4Fd3PFNa08uyyQrvwCZ
-IM6gRRG03yPs2TlFwq7DFCcYvCvRxlgSYzDVTkbVDgmJjuykGmfnSxFtFhQfxppB
-r+ccYg==
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
+ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
+AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
+DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
+dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
+JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
+A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
+SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
+BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
+yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
+iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
+kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
+hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
+aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
+GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
+qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
++dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
+xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
+bDtUbUIh3bPnDHUI9So2aC1i27Q=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -62,25 +65,28 @@ r+ccYg==
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-       MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEFBQAwXjExMC8GA1UECxMoRGVwYXJ0YW1l
-bnRvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwHhcNMTExMDMxMjAxNjA2WhcNMTQx
-MDMwMjAxNjA2WjBeMTEwLwYDVQQLEyhEZXBhcnRhbWVudG8gZGUgVGVjbm9sb2dp
-YSBkYSBJbmZvcm1hY2FvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSPve5D
-Psco2/eYX9R9DiqIIL8DWjxDBgkaG/JPsh70NBQ/VQvLEXiFJhD9e2VrsGbQTeIk
-FmRwkNn2TrE6EjAytZrut5bMPOpQJ3NtvQO29KqJHV6IOId9LSSNLjzYgFoGw72F
-g655GbwWWsB7wkERVZqKV3X/2jc5rMVvo2eb3u1u5bSQsd4CMznPlDYcNoA8fibD
-vxy11mtCAuB3AqfvUQ8isPYPDTQHP/U12/HUok9QXEGEMdPRwxNDeKZ5am2hzLrl
-OrurbGkHC2RaMmoYwtigZVuvj5oGrwJqGhb7zMyuWqhpU1T3f3xrC0aIu4UpBFDP
-Chg44DL0KgOVwkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMSkGCAcfrSqA4SX+
-r/vTJs8yyMMC4y7+QepZ769jUKKOpCQN4SYrm/yRFcCZSXeT3Z/2EDaYdFfwn2fA
-GqObZCHyxXPwM6dn1bDFh9GYHoYG9HAHf3yCeb1J0ZWW884H3twJ4bQDGijOTGLq
-8mACaAeFZ4mMMhA9SboOPplRiy+71wG2Qy0PaRT/jBXFUHBB0NWMDkz9rGHpd5NL
-TZuudxelwa4buucQEmg0MDfeNVkIgSQ8a4Y4AQZRHbrKI4Fd3PFNa08uyyQrvwCZ
-IM6gRRG03yPs2TlFwq7DFCcYvCvRxlgSYzDVTkbVDgmJjuykGmfnSxFtFhQfxppB
-r+ccYg==
-
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xJzAlBgNVBAoTHlVuaXZlcnNp
+ZGFkZSBkbyBWYWxlIGRvIEl0YWphaTEMMAoGA1UECxMDR1RJMR8wHQYJKoZIhvcN
+AQkBFhBhZG1pbkB1bml2YWxpLmJyMQ8wDQYDVQQHEwZJdGFqYWkxFzAVBgNVBAgT
+DlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
+dW5pdmFsaS5icjAeFw0xNDA0MTcxMjMzNTdaFw0xOTA0MTYxMjMzNTdaMIGtMScw
+JQYDVQQKEx5Vbml2ZXJzaWRhZGUgZG8gVmFsZSBkbyBJdGFqYWkxDDAKBgNVBAsT
+A0dUSTEfMB0GCSqGSIb3DQEJARYQYWRtaW5AdW5pdmFsaS5icjEPMA0GA1UEBxMG
+SXRhamFpMRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxHDAa
+BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC0j73uQz7HKNv3mF/UfQ4qiCC/A1o8QwYJGhvyT7Ie9DQUP1UL
+yxF4hSYQ/Xtla7Bm0E3iJBZkcJDZ9k6xOhIwMrWa7reWzDzqUCdzbb0DtvSqiR1e
+iDiHfS0kjS482IBaBsO9hYOueRm8FlrAe8JBEVWaild1/9o3OazFb6Nnm97tbuW0
+kLHeAjM5z5Q2HDaAPH4mw78ctdZrQgLgdwKn71EPIrD2Dw00Bz/1Ndvx1KJPUFxB
+hDHT0cMTQ3imeWptocy65Tq7q2xpBwtkWjJqGMLYoGVbr4+aBq8CahoW+8zMrlqo
+aVNU9398awtGiLuFKQRQzwoYOOAy9CoDlcJHAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAByTETZ7kpMiPJvt/zy+0q5ClKYda3WpqLpaTwnLl359k72A0KSYrZn6siv6
+GcSrTzlf5X+gEH1rFqySh+JYfIUo/xS2CYJC9zbtuCXiJKuzuXBgR69aPlzBP5kG
+qXMP3r2nGYCZhoVdtONZR7i1V9tzhjEziRi8FTj0RMxxE01pNYd34mp82tRxZsFk
++dmRQQjNfM5zWaEosG94oV1X+QP06y4AER/kTVZKh1TJOPzHvY/fG8QheEKOHO1j
+xEaJyWk8Zd0mumri/3t63hxIHiILLh+rYK+0qYV/5SF51Qb6a+V93w0FfR0X+vbF
+bDtUbUIh3bPnDHUI9So2aC1i27Q=
                     
             </ds:X509Certificate>
         </ds:X509Data>
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.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 e8863448..e97615f0 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="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
@@ -13,12 +23,8 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui: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
@@ -47,42 +53,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 4f14f4fd..9451fd3f 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,41 +1,75 @@
 <?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: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:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
+LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
+sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
+6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
+vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
+L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
+o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
+rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
+GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
+EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
+KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
+UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
+YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
+9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
+scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
+2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
+IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </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,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
 EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
 Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
@@ -66,37 +100,56 @@ YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
 9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
 scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
 2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
-IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
+IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=
+</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>
+    <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>Lat</GivenName>
+    <SurName>Admin</SurName>
+    <EmailAddress>mailto:latadmin@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
index 0b2cdeda..76bfe293 100644
--- a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
@@ -15,35 +15,37 @@
         <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:InformationURL xml:lang="en">http://www.ifma.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://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=
+    MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
+aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
+bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
+byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
+ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
+NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
+YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
+YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
+aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
+bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
+XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
+ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
+aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
+E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
+BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
+IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
+39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
+WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
+7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
+FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
+UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,27 +68,29 @@ WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
         <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=
+MIIERjCCAy4CAQAwDQYJKoZIhvcNAQEFBQAwgegxLjAsBgNVBAoUJUlGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBE
+aXJldG9yaWEgZGUgR2VzdMOjbyBkYSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8Oj
+bzEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8Oj
+byBMdWlzMRIwEAYDVQQIFAlNYXJhbmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQD
+ExNzcnZjYWZlLmlmbWEuZWR1LmJyMB4XDTE0MDQxMTIwNTEzNVoXDTE5MDQxMDIw
+NTEzNVowgegxLjAsBgNVBAoUJUlGTUEgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBN
+YXJhbmjDo28xQjBABgNVBAsUOURHVEkgLSBEaXJldG9yaWEgZGUgR2VzdMOjbyBk
+YSBUZWNub2xvZ2lhIGRhIEluZm9ybWHDp8OjbzEfMB0GCSqGSIb3DQEJARYQZGd0
+aUBpZm1hLmVkdS5icjESMBAGA1UEBxQJU8OjbyBMdWlzMRIwEAYDVQQIFAlNYXJh
+bmjDo28xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNzcnZjYWZlLmlmbWEuZWR1LmJy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAndeQ2TDWt0/WD456cqgd
+XQ9b/8GofISh4bqfAgE/ryJnTq7+Qf/ZEFoAD0dIpSyPlBhUjYE2wwOlUURD4+8y
+ivNSwYbC44MXvTH+7QES86Ei+/rSUvmjOaibXr3jcoEZZPoYSHBUWvuPM8yubjXw
+aY+dyyg9AjGMGq6bm5xm7prcE9IQT++sCzhnLx9PLpfEiFlPr3pnZKuLWvlEb/OV
+E0IkzzCAoFfLDfZAbEK5NInsd399Zw9o0Bfo3M0pRGzyZUHahnTKiGBagdK//tpm
+BhiT3azSvfWF7pxleUOCMJHTEum426AtaBpFyKBrvIEKr0OqgDj8uBsia4PH1lUY
+IwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBIZQEEWkQzIWbBHPbM5qGGkRgu2KfT
+39lv6LGDDjZaJH7CPFP1FElKAsw1FVOlsYGdF5xbvclqLiZeRa2WUlFqsEeZQHS2
+WcCWgsYjMANovjer9I834lFpxNATnKe4H3NsI3rlrfyBGJrSX3w/48s2xa8XgWDq
+7EWAk7GVDgPvc25kWIzlex6FXlfmPOnwsXrgpieCk6HH1jFn+xKshJHMntCjk3al
+FBO6NIuxgaFzNAp1X7EbCxKpFTZxjxC1YjfZAa/4XbZHqV9NHuW9w7QRz5wYvbDB
+UgQ4/xzHw95wCdYlE/aIdGiIG/ATFHnXv2ZiSCm8XDmz6wDBRVfw3Wv6
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -102,8 +106,8 @@ WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
     <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>
+    <OrganizationURL xml:lang="en">http://www.ifma.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Daniel Torres</SurName>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
index d9d5d66d..2d845e3f 100644
--- a/swamid-interfederations-2.0/sso.man.poznan.pl.xml
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
@@ -1,7 +1,7 @@
 <?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-04-07T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-28T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index e22952f7..ed37e4e6 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,35 +57,35 @@ 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>Tuomas</md:GivenName>
-    <md:SurName>Honkala</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petri</md:GivenName>
-    <md:SurName>Teraspuro</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Elina</md:GivenName>
-    <md:SurName>Toivanen</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </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>Tuomas</GivenName>
+    <SurName>Honkala</SurName>
+    <EmailAddress>mailto:hakajasen@utu.fi</EmailAddress>
+  </ContactPerson>
+  <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/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.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/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
index fdee8bc4..f3962283 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
@@ -1,8 +1,5 @@
 <?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">
-  <!--
-		This is a "DANTE" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
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 adf8b800..4516009c 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -37,9 +37,9 @@
     <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 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:DisplayName xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Digital repository and services related to the LINDAT/CLARIN project focused on language research infrastructure at the 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 zaměřené na podporu výzkumu jazyka na Ú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>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
index 099a4f60..d504df0a 100644
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
@@ -23,28 +23,23 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFVOSVZFUlNJ
-REFERSBGRURFUkFMIFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UE
-CxMDQ1BEMSkwJwYJKoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5i
-cjEPMA0GA1UEBxMGUkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPdm1zaGliLnVmcnBlLmJyMB4XDTEzMDkwMjEyMDEwMVoX
-DTE2MDkwMTEyMDEwMVowgcExOTA3BgNVBAoTMFVOSVZFUlNJREFERSBGRURFUkFM
-IFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UECxMDQ1BEMSkwJwYJ
-KoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5icjEPMA0GA1UEBxMG
-UkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQGEwJCUjEYMBYGA1UE
-AxMPdm1zaGliLnVmcnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA2nK7Wq2HIdxRO5pOn/OqjL+pqF4ymtMwh9gm5NIDVw+51eTY7vgF2JfhyI6R
-gpBjdXy/mdbcQFDeCOeHm5dGSvrj6GijudN8SxmpOtJhrg1QXUsVCORBGVDqg4pJ
-xPpF7F7Os/KHjcw5R1e3FQfDBf+RMi+3n/8tw2F5/4XXvaEuzDj3kEIaG9l+1szw
-tgfw8nOBv2aCEFJw3diNojnh7LCTHQyP6WzSTRhmtaqqJ7SS0jgbbWuWtuF2OOxK
-Ri3mASA0DmRaTrMY9usutfkddpxJ0f7VjhTjam+4J8a6PsWJvXO5SoHKW/GvP61C
-VW/ya6DZKKjS8OGk1sQ0ApbryQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQASVqt+
-fIOD7MU30TUjylL5F1TH4F7Wco3Oh/TA1GmiOo3n3Jw/Jwp/SO/cRehHgG0P5Inh
-od01LhGYR8IWYhNE0/xW5AmohOMPrPrFvGhZYdea8q5lDUgMOAhJ6HcVtX916i30
-BOZRJT6YBZ1+gM11j+uzVH1POrPRpBKIG2mFXIENyykcUH1/fzZq6nCYQRkRqwGW
-Qqr/W736U+9O7maGgwiyyB1Qoh009siTxLjIHPWqu+Uv99CKYioPv87dUpXRrG/w
-T03SRkawusIfxjWkchmxr1AZmJmC+k4fvfPp1U4CPgBpN/bn0/z+jacWe7P6XSV2
-A7uW95WfCmbke4rc
+    MIIDFjCCAf4CAQAwDQYJKoZIhvcNAQEFBQAwUTExMC8GA1UECxMoTlRJIC0gTnVj
+bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDzAN
+BgNVBAMTBnZtc2hpYjAeFw0xNDA0MjMxODM0MThaFw0xOTA0MjIxODM0MThaMFEx
+MTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFj
+YW8xCzAJBgNVBAYTAkJSMQ8wDQYDVQQDEwZ2bXNoaWIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDacrtarYch3FE7mk6f86qMv6moXjKa0zCH2Cbk0gNX
+D7nV5Nju+AXYl+HIjpGCkGN1fL+Z1txAUN4I54ebl0ZK+uPoaKO503xLGak60mGu
+DVBdSxUI5EEZUOqDiknE+kXsXs6z8oeNzDlHV7cVB8MF/5EyL7ef/y3DYXn/hde9
+oS7MOPeQQhob2X7WzPC2B/Dyc4G/ZoIQUnDd2I2iOeHssJMdDI/pbNJNGGa1qqon
+tJLSOBtta5a24XY47EpGLeYBIDQOZFpOsxj26y61+R12nEnR/tWOFONqb7gnxro+
+xYm9c7lKgcpb8a8/rUJVb/JroNkoqNLw4aTWxDQCluvJAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGPyI/uEekNlcykz9hic/xyMC8BeuXtn6shbwiIZcd3TIaiSmq+Q
+gWTD/ZK0EZjyM9F9owsGkzz/y5umpZaVw+iO7cya6hsB9Ve7RN3AEBnksZWWV8jw
+5d2786+FJu4cjxQg5qCRFJ1Z9UOHlaSKchm/KVC8Gv66o+A6edjeSvQfShimkn/d
+c6po0mmz9SpzehUZ7Hg0BbU1v9oPdiY8J5907GhcrNloRoPfTqANUYUWT9BlxwTW
+u3tfKl0VSvRTkdioDwv/fZhS5KU9gpqUBquqnw9PtZex/M9Lm5/pm1RhLircqYOU
+KWHfJdmrmF3Hyw4kGxpAl2d2H+5CTRnqvoo=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -67,28 +62,23 @@ A7uW95WfCmbke4rc
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFVOSVZFUlNJ
-REFERSBGRURFUkFMIFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UE
-CxMDQ1BEMSkwJwYJKoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5i
-cjEPMA0GA1UEBxMGUkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPdm1zaGliLnVmcnBlLmJyMB4XDTEzMDkwMjEyMDEwMVoX
-DTE2MDkwMTEyMDEwMVowgcExOTA3BgNVBAoTMFVOSVZFUlNJREFERSBGRURFUkFM
-IFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UECxMDQ1BEMSkwJwYJ
-KoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5icjEPMA0GA1UEBxMG
-UkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQGEwJCUjEYMBYGA1UE
-AxMPdm1zaGliLnVmcnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA2nK7Wq2HIdxRO5pOn/OqjL+pqF4ymtMwh9gm5NIDVw+51eTY7vgF2JfhyI6R
-gpBjdXy/mdbcQFDeCOeHm5dGSvrj6GijudN8SxmpOtJhrg1QXUsVCORBGVDqg4pJ
-xPpF7F7Os/KHjcw5R1e3FQfDBf+RMi+3n/8tw2F5/4XXvaEuzDj3kEIaG9l+1szw
-tgfw8nOBv2aCEFJw3diNojnh7LCTHQyP6WzSTRhmtaqqJ7SS0jgbbWuWtuF2OOxK
-Ri3mASA0DmRaTrMY9usutfkddpxJ0f7VjhTjam+4J8a6PsWJvXO5SoHKW/GvP61C
-VW/ya6DZKKjS8OGk1sQ0ApbryQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQASVqt+
-fIOD7MU30TUjylL5F1TH4F7Wco3Oh/TA1GmiOo3n3Jw/Jwp/SO/cRehHgG0P5Inh
-od01LhGYR8IWYhNE0/xW5AmohOMPrPrFvGhZYdea8q5lDUgMOAhJ6HcVtX916i30
-BOZRJT6YBZ1+gM11j+uzVH1POrPRpBKIG2mFXIENyykcUH1/fzZq6nCYQRkRqwGW
-Qqr/W736U+9O7maGgwiyyB1Qoh009siTxLjIHPWqu+Uv99CKYioPv87dUpXRrG/w
-T03SRkawusIfxjWkchmxr1AZmJmC+k4fvfPp1U4CPgBpN/bn0/z+jacWe7P6XSV2
-A7uW95WfCmbke4rc
+MIIDFjCCAf4CAQAwDQYJKoZIhvcNAQEFBQAwUTExMC8GA1UECxMoTlRJIC0gTnVj
+bGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDzAN
+BgNVBAMTBnZtc2hpYjAeFw0xNDA0MjMxODM0MThaFw0xOTA0MjIxODM0MThaMFEx
+MTAvBgNVBAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFj
+YW8xCzAJBgNVBAYTAkJSMQ8wDQYDVQQDEwZ2bXNoaWIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDacrtarYch3FE7mk6f86qMv6moXjKa0zCH2Cbk0gNX
+D7nV5Nju+AXYl+HIjpGCkGN1fL+Z1txAUN4I54ebl0ZK+uPoaKO503xLGak60mGu
+DVBdSxUI5EEZUOqDiknE+kXsXs6z8oeNzDlHV7cVB8MF/5EyL7ef/y3DYXn/hde9
+oS7MOPeQQhob2X7WzPC2B/Dyc4G/ZoIQUnDd2I2iOeHssJMdDI/pbNJNGGa1qqon
+tJLSOBtta5a24XY47EpGLeYBIDQOZFpOsxj26y61+R12nEnR/tWOFONqb7gnxro+
+xYm9c7lKgcpb8a8/rUJVb/JroNkoqNLw4aTWxDQCluvJAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGPyI/uEekNlcykz9hic/xyMC8BeuXtn6shbwiIZcd3TIaiSmq+Q
+gWTD/ZK0EZjyM9F9owsGkzz/y5umpZaVw+iO7cya6hsB9Ve7RN3AEBnksZWWV8jw
+5d2786+FJu4cjxQg5qCRFJ1Z9UOHlaSKchm/KVC8Gv66o+A6edjeSvQfShimkn/d
+c6po0mmz9SpzehUZ7Hg0BbU1v9oPdiY8J5907GhcrNloRoPfTqANUYUWT9BlxwTW
+u3tfKl0VSvRTkdioDwv/fZhS5KU9gpqUBquqnw9PtZex/M9Lm5/pm1RhLircqYOU
+KWHfJdmrmF3Hyw4kGxpAl2d2H+5CTRnqvoo=
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 6b16041b..20fa32d3 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,9 +1,13 @@
 <?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:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
@@ -144,7 +148,6 @@
       <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>
@@ -170,12 +173,6 @@
       <shibmd:Scope regexp="false">bcsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rosborg-gym.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>
@@ -203,4 +200,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/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
index a6a6e06d..65a0338b 100644
--- a/swamid-interfederations-2.0/weblogin2.geant.net.xml
+++ b/swamid-interfederations-2.0/weblogin2.geant.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin2.geant.net/adfs/services/trust">
-  <!--
-		This is a "GÉANT Intranet" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T15:23:31Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
@@ -12,7 +9,8 @@
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">GÉANT Intranet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to GÉANT project documents, meetings and important information.</mdui:Description>
+        <mdui:Description xml:lang="en">A collaboration platform for GÉANT Project participants.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblogin2.geant.net/PrivacyPolicy/GEANTIntranetPrivacyPolicy.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="encryption">
@@ -90,16 +88,12 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.geant.net/adfs/ls/" index="1"/>
     <AttributeConsumingService index="1">
       <ServiceName xml:lang="en">GÉANT Intranet</ServiceName>
-      <ServiceDescription xml:lang="en">Provides access to GÉANT project documents, meetings and important information.</ServiceDescription>
+      <ServiceDescription xml:lang="en">A collaboration platform for GÉANT Project participants.</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="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:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
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.ebi.ac.uk.xml b/swamid-interfederations-2.0/www.ebi.ac.uk.xml
new file mode 100644
index 00000000..7f0a5924
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ebi.ac.uk.xml
@@ -0,0 +1,76 @@
+<?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#" entityID="https://www.ebi.ac.uk/ega/">
+  <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>
+  <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://www.ebi.ac.uk/ega/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The European Genome-phenome Archive</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">European Genome-phenome Archive</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</mdui:Description>
+        <mdui:Description xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
+        <mdui:Logo height="62" width="180">https://www.ebi.ac.uk/ega/sites/ebi.ac.uk.ega/files/documents/images/EMBL_EBI_RGB_petrol_lo-res.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">NGS genotype variation cancer diabetes disease</mdui:Keywords>
+        <mdui:InformationURL xml:lang="en">https://www.ebi.ac.uk/ega/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.ebi.ac.uk/about/cookies</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAMOTGo+6cOgBMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHZlcy1lYmktMTAuZWJpLmFjLnVrMB4XDTEyMTEyMjA5MTc1MloXDTIyMTEy
+MDA5MTc1MlowHzEdMBsGA1UEAxMUdmVzLWViaS0xMC5lYmkuYWMudWswggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjS5ePByst+LtG8/i7+C7nl/qWQLsF
+mgFWJIafuoUSc/Iy85sQCJYUSpwMvaV+XqxjMjQj79z0aOkA0wyw+MnRnAQnr9jJ
+adbVNMwZOlqPPXAXfZmwW1DkM2fdz8COipBfW9b5lvNu1hZ8Rm0nd1biSxp1+AhL
+4p6FXqM0pjXMO4mZnesmPkoC9IK5TcpVpOE3WWazsLCTlSmE7+iDLO6dwkEE4IYV
+/zRkrQ56hBIxCVui/hrXatbcJy8dPn6JREsnYhZCTJclb+liqxcv9c266aUx5hTf
+WItvFQNkpPp7FsJhzEZOMcUkGebWLr/n5Dw6ERR+/ZM1n/1rhdzfD9hdAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHZlcy1lYmktMTAuZWJpLmFjLnVrMB0GA1UdDgQWBBTg
+/BOPCQZP1Tpzz3MVM/ijVkrHVjANBgkqhkiG9w0BAQUFAAOCAQEAZQf3HB46uhJ+
+vw+3ir6C5r9+6H3B4wVFVgXm9XIZB2orryui4Pub/jfoSoxUFkM65G0lnTqtZ66z
+rOTPJz202ya77jRn2uTXmy2YLLPO5aWPqlgGwrCche1RoFoCUEi9vMACp0XDosEO
+sfLW43EnSzV7e0PSQWCpyd4zM9o5AXFN8W5DxT3xxDgSLKVLfcPhhmWZY0j0Smif
+0OgHpkYrmnMoXOPgcKOQORrB7QD1ULnn3eYFaGxbi7J5/tkB8eFPphWtBI7p5YzZ
+5NBxB7QhViLbVlolHx/UoJnmcnFcHXtdEcgvmCcxqlFSE17911r3zKWdRIXiNoot
+u7YBIOFkbw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="fi">European Genome-phenome Archive</ServiceName>
+      <ServiceName xml:lang="en">The European Genome-phenome Archive</ServiceName>
+      <ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</ServiceDescription>
+      <ServiceDescription xml:lang="en">The European Genome-phenome Archive is a service from the EMBL-EBI to archive and disseminate data from biomedical research projects.</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
+    <OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
+    <OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Jag</GivenName>
+    <SurName>Kandasamy</SurName>
+    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Jag</GivenName>
+    <SurName>Kandasamy</SurName>
+    <EmailAddress>mailto:kandaj@ebi.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index ba3c1f16..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>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</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>MIIE8jCCA9qgAwIBAgISESHmB/1YUGeeJHspwyEmQou4MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMwMjE4MDkzMTM3WhcNMTUwMjI0MTYxMDEwWjBLMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw5EIVTrlQBc3C7S1KuJ3pMncEEcnQg1Jn2RHGgUlmUgZVYGsbyID7f3z4fAv1QkVTfPk/FcwnAA0Z03KH9x0skkJ2jseMRCEkblUoJ4oOHABTq3zVwOvp5gKPbAT/yh1Oxm0Q4dxoHbO8CbnLLHG4Glk0Wehch7rpEOTg+5Z5uvnPXulTPHhHYomXZOdIt9loAoXsjG+4syQIOTsnzrMOznOTY1tCN4qYxDa+xsl1RhggKVGkggDhWq+plL9T91BEQSGXK+63RF6K7bCDnIU7+mBGeWU3hVL9zIaSvO++MKoQarWavLxfp+n8SYMvV5j1+K1fhO7MwSv71QJq+lhwwIDAQABo4IBwjCCAb4wDgYDVR0PAQH/BAQDAgWgMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEKMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCgGA1UdEQQhMB+CHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBT60b17A1RwTyt94NQOm++yXTrfojAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAWOBI5SREMlWLRx5OONoICRxzjMQtF5lG94gTqlzD6DvU0svW1AAwDA3HUrgH9xagJDCNqHqrya1RS2LDtAwDenUir9/AE3RwrnsvNAucds/+htiHuUlYFNGlqOMr4WH6NxpZ1o3u4VIpELhOtrOPof0ba5PvA4dD2adyEJSKtESlgarUKulHAKeQeEFERxqrW9c6qP0lXc3SuukwHsmEiGniscQGQLj/bChTGzbCdYMPdS9ETF/uOqAocg+Hge8bBbUnZrm9tYidytJhpFaF+hEvfojlik6Z/LGVPykrJXBh7zMl4hWx1kJtNij0LE6dX9TFeYDjjUbD//0P7CmVsw==</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">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at 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.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
index 53dbc143..ec8a588e 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.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.portal.euromonitor.com/shibboleth">
-  <!--
-		This is an OpenAthens service provider for Euromonitor International plc.
-	-->
   <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>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
index 7375a2b9..3b288ae0 100644
--- a/swamid-interfederations-2.0/www.scran.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.scran.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://www.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Scran" Shibboleth SP belonging to Scran 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"/>
author	Leif Johansson <leifj@sunet.se>	2014-04-24 15:17:18 +0200
committer	Leif Johansson <leifj@sunet.se>	2014-04-24 15:17:18 +0200
commit	39bcf9891ec0f1600bd6ab6c5fa389ab53097a94 (patch)
tree	e4d98ba42122c0534f1ca5e3aec13c1867c8bc57 /swamid-interfederations-2.0
parent	8e7de77a587e1f912096fd11a51b8ebcd768cf53 (diff)