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

327 files changed, 34437 insertions, 1017 deletions

diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index d5f029c5..cd8f79ad 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,33 +1,48 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-04-08T11: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.aaiedu.hr" registrationInstant="2012-01-01T08:00:00Z">
+            <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    	</mdrpi:RegistrationInfo>
+</md:Extensions>
+<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:Extensions>
+<mdui:UIInfo>
+<mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
+<mdui:DisplayName xml:lang="hr">Središnji AAI@EduHr autentifikacijski servis</mdui:DisplayName>
+<mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
+<mdui:Description xml:lang="hr">Središnji autentifikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentifikacije (Single Sign-On Service)</mdui:Description>
+</mdui:UIInfo>
+</md:Extensions>
+<md:KeyDescriptor use="signing">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:KeyDescriptor use="encryption">
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIEbDCCA1SgAwIBAgICAVYwDQYJKoZIhvcNAQEFBQAwQTETMBEGCgmSJomT8ixkARkTA25ldDEVMBMGCgmSJomT8ixkARkTBWdlYW50MRMwEQYDVQQDEwplZHVHQUlOU0NBMB4XDTEwMDYxMDA3NTk1NloXDTE4MDExNDA3NTk1NlowWTETMBEGCgmSJomT8ixkARkWA25ldDEVMBMGCgmSJomT8ixkARkWBWdlYW50MREwDwYDVQQKEwhBQUlFZHVIcjEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxSGZkVlXr7xZYvilQxqXfxinRUuKPJMVrrOXo33P5Y7PXZiNRiMldtAyD3gQpcPWY68HrTZWspypX6oLRKRIlRC7Nj4/E6Bwn+pD/TqnN8UwL5SuDm+kp7z/zHXYGfmalIzibOHpPlmV39PcObdPE02wtrxV3WtmZjakzD8vZwnRjwcS3jbcHgwmEnzcAcMrrXtJ4A5G5OlgE7A3U5cCttxd3Y8w3u9meZWAxsb9AzrWGwYUsH1bbStVQqXFZHH5U9VIs8iyQSfHCdV2jEN46nZkwbNVPnIMzQ3eaZrZ4JRth1BUdpNnbvv2mZH7YPbdLz2vWSrBpFfubwuxJHrrEQIDAQABo4IBVDCCAVAwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU3UDcH284PfxY0A2gvZ7CGfclywIwHwYDVR0jBBgwFoAUiw+PJ4DSk9dGXZGEuy6YYq4E8dIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB9BgNVHREEdjB0gg9sb2dpbi5hYWllZHUuaHKGYWh0dHBzOi8vcmVnaXN0cnkuZWR1Z2Fpbi5vcmcvcmVzb2x2ZXI/dXJuPXVybjpnZWFudDplZHVnYWluOmNvbXBvbmVudDpiZTphYWllZHVocjpsb2dpbi5hYWllZHUuaHIwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3NjYS5lZHVnYWluLm9yZy9jcmwvY2FjcmwuZGVyMBsGA1UdIAQUMBIwEAYOKwYBBAGB1H4BDAIAAAQwDQYJKoZIhvcNAQEFBQADggEBAHvccCTPvtBVhBUJA8TZEAhOhctLbafP9vE2BDEuPy7cQLujli9mnocpIthwZ4JmRp2xZeTki+vetpikyc192o4d6iUrYVorY//uow3YUifsSDIN2VNfZvjs0lDAzfdTfXMvDugg8hEoEhOhr/yP6FGalM1nhvxauD4jwv6rgTuKPcNWDvFV6LVCxO0m3Mfk5pSlndFE9SXrQFC1dyXRcU1KqvMjjbZ0idKEpe7wMwIgWNGadqKCtBzF1GLkZQSsgiQUIVD3YG6OYBHzi6+/Shl3oueoMGWa8NQdycPHiz0qBS3CuCVwpJAoGymxJqoyWVkyKcrsYpwFgNq0PoAhN78=</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</md:KeyDescriptor>
+<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/sso/saml2/idp/SingleLogoutService.php"/>
+<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+<md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/sso/saml2/idp/SSOService.php"/>
+</md:IDPSSODescriptor>
+<md:Organization>
+<md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+<md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
+<md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
+<md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentifikacijska i autorizacijska infrastruktura sustava znanosti i obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
+<md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+<md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
+</md:Organization>
+<md:ContactPerson contactType="technical">
+<md:GivenName>Dubravko</md:GivenName>
+<md:SurName>Voncina</md:SurName>
+<md:EmailAddress>team@aaiedu.hr</md:EmailAddress>
+</md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br.xml b/swamid-interfederations-2.0/Shibboleth.uem.br.xml
new file mode 100644
index 00000000..b6dec56d
--- /dev/null
+++ b/swamid-interfederations-2.0/Shibboleth.uem.br.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://Shibboleth.uem.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">uem.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEM - Universidade Estadual de Maringa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEM - Universidade Estadual de Maringa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uem.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uem.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
+MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
+KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
+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==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.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">uem.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
+VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
+MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
+MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
+KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
+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==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.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">UEM - Universidade Estadual de Maringa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uem.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uem.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Helcio do Prado</SurName>
+    <EmailAddress>helcio@uem.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
new file mode 100644
index 00000000..33309cde
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
@@ -0,0 +1,145 @@
+<?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:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://www.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Bern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bern</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Bern</mdui:Description>
+        <mdui:Description xml:lang="en">University of Bern</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAeVJREFUeJyUkr9LQlEUx58u6p8gOLq5CeKkq+gkooMi6CCCILi4ujyMokhLkSIJdDKMUmxoShOHkFwEHdR0CULQ5+Dv3yfPhSsVGTncx7vfe87nnPs9lwEA5r9rvV4zFosFqtXqA9X+nYxrPB6farVayGQy9W63e7k3gOO4C4VCAV6vF8xmM4xGo8BegFKp9OR0Oje/wJpMJqjVavd7ARKJxIfP54N6vX6n0+mg1+tFGGxjMpmcrFarg9lsdrxYLA6/JqG+XC6JlkqlmkajEbCLXC73Sjzw+/3gcrlApVKBUqmEZrOZpMlYTa1WQyAQAArr9/vn8/n8aDuFwWBwjhBm46dEIgF0mjqOe9RDodBq17Xww9psNhKIM6YH5XL5kc/nA4/HAzRvJ2DTDiOTyQggGAxuAdFodEC7Gg6HZzsBrVbrRiAQEECxWHymBw6Hg2h6vR52JRNAOp1++1lpOp2eSKVSAmBZlgBwZHQa3wDoNAYaDIZtpXg8zqGG989ms6+Y7Ha7twZ/A2AiBmMAvoF8Pl+02+1EEwqFZKwejweSyeT7r1eIRCJzkUgEYrEYrFYrhMPhZbvdvpbL5YDeaDQaiMVi3F9jZCqVygO+rEajcUsPOp3OVaFQeEGT/zLxEwAA//8DAH2UumiGm7jIAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAZRSURBVHic7Jp9TFNXGMaJMYpTg4tBF2OMATGYhYWZCUTEzSj+Y2Q47DLUyWAJKhsi39kQEIHJhLCBjgxxGwgCg/GhCOL4UNSKEw0MHBXHN8jnBAUc0MJz9pZbSiHGLN5LK5UnTXN73nNvnt8957znbW912GsmHf6XiI2NXb169dDQEP9LqUECAPv5+VlYWPC/jnokALBIJHJwcOB/HfVIAGBLS0tbW1tHR0dPT8/u7m7+F5xW8QUeHBw0MDAwMzMLDAyklWxnZwdAEGfTJL7Ara2tS5YsEYvFdJyTk7N48eKOjg4hjE2X+AKXlZURcFNTEx3funVr0aJFjY2NQhibLvEFTktLW7VqlVQqpePg4GBDQ0Oa5EIYmy7xBQ4NDV23bp1EIomOjqb5HB8fL4it6RNf4LCwsDVr1piYmGzZsiUjI0MQT9MqBXBqaqqXl5ePjw8l22PHjnl4eDg7O09Zjbm5uQEBARSlPs3NzVyjTCbrG5O6jb+sFMCnTp0KCgry9/dfuHChzphofnZ2dir70WZD+y0XmjdvnhJ4xmnSlKaygVIuR7Vt2zbVEMHr6+tzISokR0dH1etTME0CzsvL0xkXVciqoaKiImXI1dVVvSaF1CRg2leUVLRiVUOUjZWh5ORk9ZoUUpOAbWxsOCQ9Pb2WlhbV0I4dO7jQ/Pnzq6ur1WtSSE0ADwwMUNnAUZmbm4+MjChDT548WblyJRcyNjZ+xUuLF2sCuKqqitLvc1dpaWnpnDlzuJC9vb3aTQqpCeCkpCTlKk1JSVHtFBkZqQxFRUWp3aSQmgB2c3PjkBYsWFBTU6Paafv27VyIxpm+IXCNtbW1/f39ajUrhBTAVFdYWVlxVFQbq/5AVVFRQbeAC61YseLx48fU2NvbS93u3bunGdc8pADu6ekhGI5KJBIpw5S6du7cqZzP1tbWXLu3tzcNu2pimylSANMc1tXV5agIhmukCtnFxYWm+tKlS7mQr68vtefn5y9btuz+/fsac81DCuCuri5l5WhkZJSYmBgTE0MlZHh4OA3j2rVruRCNakREBG1R6enpmvX90ppIWnFxccuXL+fA5s6du3nz5oKCAi6UkJCgrLFNTU0LCws15FYATaq02traSkpKiouLKQNP6VdXV0ft5eXl9H1QjfaElwA/084szQJru2aBtV2zwNquWWBt1yywtmsWWNulAM7Qdk0FjtZ2TQV+faQAlkqlAwMDmrWiHimAJRJJVFTU8PCwZt2oQQpgsVjs7u4+5YGDVkoBnJmZGRISkp2drVk3apACuKOjo7KycuY+1///en6WhspLtZFNbnnuWVP64FEXqv5m7d0vPldtGgeuaWLXy1HXitJKNLUj+TLa/0FxGevtQ+5N1Lawgtvs2SByrqOxHXFZ+OUiep6yCyXsTDqrqGHDMpy/jNgMDA4hT4wHDeznC4hNR00jrt2FpSPEFZDUy1vOZrNeTT6CGwc+k8X2ByLlCg6dwKUb0DFBwI/45Cv2Vz02fIo/H2KTE9IK8LEvu1IKQxscP4uuHph/Bmtn7PbBjXK8+QGiU+XAFg64WobDJ7FhL6N7R+RvbUViLhoeYZMjvghj/c9eAeD4HGbvh7hMMoQL12DtAsMPYefNquvx3j6MjkLki3f3IKuYhh1v2+GHNDztx0YnvLMb/jGs7xm9w/gj+TBu+pzmMFLysddPPsk3OsJsn7yRjg+EIilPg7RsArixDTZHYH0IhX/g91JEpcDzOxz6Bg2t2HeU4mQUZvvRN8BuV2HrARwOR30rvvwW2dfk75IGOAfDxh2POuEUxB42yacJ3Qjqs+drlNzFLm80tyP0J3axRJO4k5KWVEarVH4wCvmLJBthAFM+Ex0Zy+HUMiRlA/8ySulcSCaTh3r7xj+OnUVXGBnrwP19mutM75reCF7XWpqV1+BgCDwjWVsXTqfhyAn8VoTaZhwIhnsEuNxz8hwoY+Xe1KhhvhoHziiWpxyjXexmBWw9IfKglcyK7sB4F0ztQQcHQ6H3vjyNhSdo1DBfjf/HI+sqrJzke0/2VdqNcPC4fEOm3WW9PWVp9qARbuHyHUvXAqd/1axjnhof4UvX8cYGGNjId8vdvtC3YF7fo/gOHINwNAbh55jrSeTewPq9LPK8Rg3z1WuXtP4DAAD//wMAnPfzPGW0I0UAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.0.128/28</mdui:IPHint>
+        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
+        <mdui:IPHint>195.176.3.128/28</mdui:IPHint>
+        <mdui:IPHint>192.41.149.0/24</mdui:IPHint>
+        <mdui:IPHint>192.41.152.0/21</mdui:IPHint>
+        <mdui:IPHint>192.41.160.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:620:400::/48</mdui:IPHint>
+        <mdui:IPHint>86.118.0.0/15</mdui:IPHint>
+        <mdui:IPHint>86.118.149.0/26</mdui:IPHint>
+        <mdui:IPHint>130.92.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unibe.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.950509,7.438155</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
+gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
+MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
+CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
+VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
+TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
+C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
+pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
++0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
+VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
+pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
+cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
+dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
+MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
+ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
+YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
+LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
+HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
+AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
+RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
+qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
+zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
+uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
+LxDK1XTR2ZqXgnziFQWnbI54
+						</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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.unibe.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFTjCCBDagAwIBAgIUaEj3cUMMoHFpXcehDx5GzSFg6OcwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTEwMjA3MjczOFoXDTE0MTEwMjA3MjczOFow
+gb8xEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEa
+MBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzQtMDMtMTQx
+CzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRCZXJuMQ0wCwYDVQQHEwRCZXJuMRowGAYD
+VQQKExFVbml2ZXJzaXRhZXQgQmVybjEZMBcGA1UEAxMQYWFpLWlkcC51bmliZS5j
+aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANjwYYDyz1KQK/RrlHj/
+TIMkmIp1rwlv7KpDa4d8QpHTsBW831PiNI7iYQltZzxC3t8k2sJ8qDX5+uTWXJIA
+C6v60ZxWkWWLf1qkk/cznwvLkEdo1698J4vc6cx91OUX2rq/Q/zjdndXmTGgyfxw
+pAqb2uKBNbG2RoxEdyP1F8Yi3165/8LubrDKXtP9+fdKqQkxv/sZH6NrUWRrJiUd
++0KhG1LOada7F8DRKQOFtUAJ78di3wmZyJfOXye4yenCfYsWbfrUcuCJDSIqrdFQ
+VVj5AUr3hdKEAJafc22LTDDsdSuKpcv+n2/C/oH8Mdsxg7we6r/dJz4x7vM7GHhn
+pK0CAwEAAaOCAZMwggGPMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0
+cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8v
+dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBI
+MEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
+ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MBsGA1UdEQQUMBKCEGFhaS1pZHAudW5p
+YmUuY2gwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAfBgNVHSMEGDAWgBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCg
+LqAshipodHRwOi8vY3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmww
+HQYDVR0OBBYEFGm9MS6ojsIWTq+Y8EG534cfO6y4MA0GCSqGSIb3DQEBBQUAA4IB
+AQBx06TLIvS40KeCMCgDJ8MdrDlxt//3F9cyWBsXJkJLdtVD6xTBQ6+lwg9RG+ct
+RO9eZpURgeHEkcy7YkNgq0XukoKl1on7P1tJoLa6fOBq/4XU5EiAeQBeohFOohYO
+qr5PxmgEp98c7clKulvmuJBX/MSqKCHQEVx0fqsiZ7/TUdRinlLNQKVxGMrgm+KG
+zN6anM+WgtbqG+Ed4XaekXpO2EMDnle0SM8vcJ+dUgIEa0+t+fEPCAnN0vD6b910
+uzs7quvneAVGiAeqoZLZ5k62+3qldV40gI41gHflX4mIWMD+TPCFG5ue64N0nLzU
+LxDK1XTR2ZqXgnziFQWnbI54
+						</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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Campus</GivenName>
+    <SurName>Admins</SurName>
+    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Campus</GivenName>
+    <SurName>Admins</SurName>
+    <EmailAddress>mailto:admins@campus.unibe.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
new file mode 100644
index 00000000..f8cef485
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-14T13:20:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://www.id.uzh.ch/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uzh.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Zürich</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Zurich</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Zürich</mdui:Description>
+        <mdui:Description xml:lang="en">University of Zurich</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAepJREFUeJzMkl9IU1Ecx48W+SK99FKUPdgf3UznqkfpsYdlIE2DLKrXrAw30YegpwUhha9RRJLSS0SF7iVCogfBxG33LmyudG5t1wrdyiE6Kj+dc3aJIUFID3Xhd8/vfn+/7+fee85PlDWY/E2I/wcg6kvEXw1RO0q1db1lDQblLpPNbiUYbGqUeWNUrxWHo2w59KaouYua6tG5ywaI2giejgQDzxYRu8Ocu5ri+t2PnPAlmZpZJZ4q0N6bJHDnE2dlTVSFGHia1R5RE5YAeWvrTvJ8LI/YNUnnjQxDwRyVkr63eZpY+jueK0nuPV6gp3+erU6D0ddL2iNqIgoQodU/R/DVEmJniI5AmsGRnM5butOMxwoIh8ntRwt8zn4jPrvC8soPmi/N2oD9Bm3+BBNvVxF7TAL3F3kYzGrT2FSBo5c/ILZPMjico7ffYpvcwBfjeby+ORvgDOPwvsfKrfFk9Ctfltc4fc3ieFcKdT2Qxqb2dwzJr+rqyyB2hHg5kedUT6oI0DtZZ3DwTALfTYsWnyzUmbhPTnMhkMF/y6LeG+fI+Rm9KtOxiwmqPTHEAcOeA5dMHDL2SaL8JSGPSkH1swoJ1HVnRPaaxTdLs85/O13rBmfDo/xvAOWu6B8Bqqc0lPYTAAD//wMACNpDSI97aawAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAKL2lDQ1BJQ0NQcm9maWxlAAB4nJ2Wd1RU1xaHz713eqHNMBQpQ++9DSC9N6nSRGGYGWAoAw4zNLEhogIRRUQEFUGCIgaMhiKxIoqFgGDBHpAgoMRgFFFReTOyVnTl5b2Xl98fZ31rn733PWfvfda6AJC8/bm8dFgKgDSegB/i5UqPjIqmY/sBDPAAA8wAYLIyMwJCPcOASD4ebvRMkRP4IgiAN3fEKwA3jbyD6HTw/0malcEXiNIEidiCzclkibhQxKnZggyxfUbE1PgUMcMoMfNFBxSxvJgTF9nws88iO4uZncZji1h85gx2GlvMPSLemiXkiBjxF3FRFpeTLeJbItZMFaZxRfxWHJvGYWYCgCKJ7QIOK0nEpiIm8cNC3ES8FAAcKfErjv+KBZwcgfhSbukZuXxuYpKArsvSo5vZ2jLo3pzsVI5AYBTEZKUw+Wy6W3paBpOXC8DinT9LRlxbuqjI1ma21tZG5sZmXxXqv27+TYl7u0ivgj/3DKL1fbH9lV96PQCMWVFtdnyxxe8FoGMzAPL3v9g0DwIgKepb+8BX96GJ5yVJIMiwMzHJzs425nJYxuKC/qH/6fA39NX3jMXp/igP3Z2TwBSmCujiurHSU9OFfHpmBpPFoRv9eYj/ceBfn8MwhJPA4XN4oohw0ZRxeYmidvPYXAE3nUfn8v5TE/9h2J+0ONciURo+AWqsMZAaoALk1z6AohABEnNAtAP90Td/fDgQv7wI1YnFuf8s6N+zwmXiJZOb+DnOLSSMzhLysxb3xM8SoAEBSAIqUAAqQAPoAiNgDmyAPXAGHsAXBIIwEAVWARZIAmmAD7JBPtgIikAJ2AF2g2pQCxpAE2gBJ0AHOA0ugMvgOrgBboMHYASMg+dgBrwB8xAEYSEyRIEUIFVICzKAzCEG5Ah5QP5QCBQFxUGJEA8SQvnQJqgEKoeqoTqoCfoeOgVdgK5Cg9A9aBSagn6H3sMITIKpsDKsDZvADNgF9oPD4JVwIrwazoML4e1wFVwPH4Pb4Qvwdfg2PAI/h2cRgBARGqKGGCEMxA0JRKKRBISPrEOKkUqkHmlBupBe5CYygkwj71AYFAVFRxmh7FHeqOUoFmo1ah2qFFWNOoJqR/WgbqJGUTOoT2gyWgltgLZD+6Aj0YnobHQRuhLdiG5DX0LfRo+j32AwGBpGB2OD8cZEYZIxazClmP2YVsx5zCBmDDOLxWIVsAZYB2wglokVYIuwe7HHsOewQ9hx7FscEaeKM8d54qJxPFwBrhJ3FHcWN4SbwM3jpfBaeDt8IJ6Nz8WX4RvwXfgB/Dh+niBN0CE4EMIIyYSNhCpCC+ES4SHhFZFIVCfaEoOJXOIGYhXxOPEKcZT4jiRD0ie5kWJIQtJ20mHSedI90isymaxNdiZHkwXk7eQm8kXyY/JbCYqEsYSPBFtivUSNRLvEkMQLSbyklqSL5CrJPMlKyZOSA5LTUngpbSk3KabUOqkaqVNSw1Kz0hRpM+lA6TTpUumj0lelJ2WwMtoyHjJsmUKZQzIXZcYoCEWD4kZhUTZRGiiXKONUDFWH6kNNppZQv6P2U2dkZWQtZcNlc2RrZM/IjtAQmjbNh5ZKK6OdoN2hvZdTlnOR48htk2uRG5Kbk18i7yzPkS+Wb5W/Lf9ega7goZCisFOhQ+GRIkpRXzFYMVvxgOIlxekl1CX2S1hLipecWHJfCVbSVwpRWqN0SKlPaVZZRdlLOUN5r/JF5WkVmoqzSrJKhcpZlSlViqqjKle1QvWc6jO6LN2FnkqvovfQZ9SU1LzVhGp1av1q8+o66svVC9Rb1R9pEDQYGgkaFRrdGjOaqpoBmvmazZr3tfBaDK0krT1avVpz2jraEdpbtDu0J3XkdXx08nSadR7qknWddFfr1uve0sPoMfRS9Pbr3dCH9a30k/Rr9AcMYANrA67BfoNBQ7ShrSHPsN5w2Ihk5GKUZdRsNGpMM/Y3LjDuMH5homkSbbLTpNfkk6mVaappg+kDMxkzX7MCsy6z3831zVnmNea3LMgWnhbrLTotXloaWHIsD1jetaJYBVhtseq2+mhtY823brGestG0ibPZZzPMoDKCGKWMK7ZoW1fb9banbd/ZWdsJ7E7Y/WZvZJ9if9R+cqnOUs7ShqVjDuoOTIc6hxFHumOc40HHESc1J6ZTvdMTZw1ntnOj84SLnkuyyzGXF66mrnzXNtc5Nzu3tW7n3RF3L/di934PGY/lHtUejz3VPRM9mz1nvKy81nid90Z7+3nv9B72UfZh+TT5zPja+K717fEj+YX6Vfs98df35/t3BcABvgG7Ah4u01rGW9YRCAJ9AncFPgrSCVod9GMwJjgouCb4aYhZSH5IbyglNDb0aOibMNewsrAHy3WXC5d3h0uGx4Q3hc9FuEeUR4xEmkSujbwepRjFjeqMxkaHRzdGz67wWLF7xXiMVUxRzJ2VOitzVl5dpbgqddWZWMlYZuzJOHRcRNzRuA/MQGY9czbeJ35f/AzLjbWH9ZztzK5gT3EcOOWciQSHhPKEyUSHxF2JU0lOSZVJ01w3bjX3ZbJ3cm3yXEpgyuGUhdSI1NY0XFpc2imeDC+F15Oukp6TPphhkFGUMbLabvXu1TN8P35jJpS5MrNTQBX9TPUJdYWbhaNZjlk1WW+zw7NP5kjn8HL6cvVzt+VO5HnmfbsGtYa1pjtfLX9j/uhal7V166B18eu612usL1w/vsFrw5GNhI0pG38qMC0oL3i9KWJTV6Fy4YbCsc1em5uLJIr4RcNb7LfUbkVt5W7t32axbe+2T8Xs4mslpiWVJR9KWaXXvjH7puqbhe0J2/vLrMsO7MDs4O24s9Np55Fy6fK88rFdAbvaK+gVxRWvd8fuvlppWVm7h7BHuGekyr+qc6/m3h17P1QnVd+uca1p3ae0b9u+uf3s/UMHnA+01CrXltS+P8g9eLfOq669Xru+8hDmUNahpw3hDb3fMr5talRsLGn8eJh3eORIyJGeJpumpqNKR8ua4WZh89SxmGM3vnP/rrPFqKWuldZachwcFx5/9n3c93dO+J3oPsk42fKD1g/72ihtxe1Qe277TEdSx0hnVOfgKd9T3V32XW0/Gv94+LTa6ZozsmfKzhLOFp5dOJd3bvZ8xvnpC4kXxrpjux9cjLx4qye4p/+S36Urlz0vX+x16T13xeHK6at2V09dY1zruG59vb3Pqq/tJ6uf2vqt+9sHbAY6b9je6BpcOnh2yGnowk33m5dv+dy6fnvZ7cE7y+/cHY4ZHrnLvjt5L/Xey/tZ9+cfbHiIflj8SOpR5WOlx/U/6/3cOmI9cmbUfbTvSeiTB2Ossee/ZP7yYbzwKflp5YTqRNOk+eTpKc+pG89WPBt/nvF8frroV+lf973QffHDb86/9c1Ezoy/5L9c+L30lcKrw68tX3fPBs0+fpP2Zn6u+K3C2yPvGO9630e8n5jP/oD9UPVR72PXJ79PDxfSFhb+BQOY8/x6GLlrAAAbL2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0ZURhdGU+MjAxMC0wNi0wMVQxMjozNDo1MVo8L3htcDpDcmVhdGVEYXRlPgogICAgICAgICA8eG1wOk1vZGlmeURhdGU+MjAxMi0wNC0yNFQxNjozMDoxNCswMjowMDwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+SWxsdXN0cmF0b3I8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAxMi0wNC0yNFQxNjozMDoxNCswMjowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyI+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgICAgICAgICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgICAgICAgICAgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiPgogICAgICAgICA8eG1wTU06SGlzdG9yeT4KICAgICAgICAgICAgPHJkZjpTZXE+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNvbnZlcnRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5mcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcDwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBFbGVtZW50cyAxMC4wIE1hY2ludG9zaDwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNvbnZlcnRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5mcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gaW1hZ2UvcG5nPC9zdEV2dDpwYXJhbWV0ZXJzPgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+ZGVyaXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5jb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBFbGVtZW50cyAxMC4wIE1hY2ludG9zaDwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD54bXAuaWlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjppbnN0YW5jZUlEPgogICAgICAgICAgICA8c3RSZWY6ZG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjpkb2N1bWVudElEPgogICAgICAgICAgICA8c3RSZWY6b3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPC94bXBNTTpEZXJpdmVkRnJvbT4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06RG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDowNDgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC94bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iPgogICAgICAgICA8cGhvdG9zaG9wOkNvbG9yTW9kZT4zPC9waG90b3Nob3A6Q29sb3JNb2RlPgogICAgICAgICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpYUmVzb2x1dGlvbj43MjAxLzEwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+NzIwMS8xMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOk5hdGl2ZURpZ2VzdD4yNTYsMjU3LDI1OCwyNTksMjYyLDI3NCwyNzcsMjg0LDUzMCw1MzEsMjgyLDI4MywyOTYsMzAxLDMxOCwzMTksNTI5LDUzMiwzMDYsMjcwLDI3MSwyNzIsMzA1LDMxNSwzMzQzMjs3MTM5OEMyN0FCRjMxQzRDQTFDQzQ0RkVCQTVDMjhENzwvdGlmZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj43ODwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj4yNzwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpOYXRpdmVEaWdlc3Q+MzY4NjQsNDA5NjAsNDA5NjEsMzcxMjEsMzcxMjIsNDA5NjIsNDA5NjMsMzc1MTAsNDA5NjQsMzY4NjcsMzY4NjgsMzM0MzQsMzM0MzcsMzQ4NTAsMzQ4NTIsMzQ4NTUsMzQ4NTYsMzczNzcsMzczNzgsMzczNzksMzczODAsMzczODEsMzczODIsMzczODMsMzczODQsMzczODUsMzczODYsMzczOTYsNDE0ODMsNDE0ODQsNDE0ODYsNDE0ODcsNDE0ODgsNDE0OTIsNDE0OTMsNDE0OTUsNDE3MjgsNDE3MjksNDE3MzAsNDE5ODUsNDE5ODYsNDE5ODcsNDE5ODgsNDE5ODksNDE5OTAsNDE5OTEsNDE5OTIsNDE5OTMsNDE5OTQsNDE5OTUsNDE5OTYsNDIwMTYsMCwyLDQsNSw2LDcsOCw5LDEwLDExLDEyLDEzLDE0LDE1LDE2LDE3LDE4LDIwLDIyLDIzLDI0LDI1LDI2LDI3LDI4LDMwOzBFRUI5M0Y2NzcwRjM4OEU2MjNCMjc3N0UzRkUyQUQ5PC9leGlmOk5hdGl2ZURpZ2VzdD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PsfjBS4AAAAJcEhZcwAACxMAAAsTAQCanBgAAACXdEVYdENvbW1lbnQAY0hSTSBjaHVua2xlbiAzMiBpZ25vcmVkOg1BU0NJSTogLi56JS4uw4TDiS4uy5jLhy4uw4TDiC4udTAuLsONYC4uOsOyLi4ubw1IRVg6IDAwMDA3QTI1MDAwMDgwODMwMDAwRjlGRjAwMDA4MEU5MDAwMDc1MzAwMDAwRUE2MDAwMDAzQTk4MDAwMDE3Nkaj9o17AAAAIXRFWHRTb2Z0d2FyZQBHcmFwaGljQ29udmVydGVyIChJbnRlbCl3h/oZAAAEyklEQVR4nOxa0XGjMBRMCe4gzKgBSqAEl0AJlEAHlOASKIES+L8frgOXwJncLlpkCTu+i98osWY2xuhJWq2enh44b7+nX28vPA5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO/7+uVHce1FdcLqgB4YAS11zQXGzs29Ubgp4EeQIgUaItKCGoESH+yrm4YnzMCtJARcBxNNOEOoAIcvAtgGW+lbaHZ82E6MSFRBC0JsaeGEh3tYH9otgE6472PcQu37edJ5frgQMxCshBr1qEXNa6mBbw/4MVGK3iv0/RRQvL29b391no7tF4zjmvyK0iQnIWKaxrYcHthQXtoyFLWwriH6S711s28t4S9s59T1iv/Q5L3aPiJXoc5Y5rfPD94k7jDtPOW4EBDlu2w4CddIZPWqEUB1sebg0sCvQVr1ys+2lz6SAGIO7gN5OD+QBVsiYlbRbvVTCz9oGvGvU1xijxNxG6etIW4xdYK6L6FUoIL2NntPGJssBIHYrg7ZiqwLzJK8/KeCA8QgeZjPslgUaYTvCS8hxwudR7s3gxJBzVq8LxxPvPNNLg77mVUBRn/t9jEy2AjF2RMLMDUPBO3oCF+cBAc/On/4MLRRw9YRAVBXyJNf0NN4vZJzUFqb39sLregs7H+9qEOjegoK6gWIJ0c5FPBZteufDweCCRPsOATcTC8QqA28r5Dvt26BPpmf0rCIlIOomWZRdARn4a3xeBX1ZSZI7i2cMCQFbrDq3fB3UN+iTW30hypRoV0Dcp3ijfJ9gx7gWCsgQNQsvHYft1XOvBHQaAzk5fF5tXzTsWO/8wcFT6moLow0XJBVXmTYxrnyQ/4SA6yTx/eh8zOLCqICV1A0yPsfppL6SvlRAhoE5FJCr0SQErIQ0T7STelusjfOhoSXR71JiAnYUKizi1i0E6Z0/GauEgAVWsbUWcJ7nh7BXUgKmPJAn3+D8CTi4/UOkCGLRtxZwPWVjxhCYW7F0/pRjwttG2pTOJ6KxGMj+Vs/GfT4S9rEFdf70vHphIXGueqaAPIWZlhQRYrXEtCpyHRPwKDaxU3iTvEowv0fAc6LORMBOJtrsEKPX6eeegKPEzKs8UOx4mrbOP3cXwXUtojIkVGjfcPeIgMwaumcIqE8ifcIDSbaVe9FruceJR59ExEYfy1YPCq7prZPzSTS3/gz+KiDz1I/2XyogiJ/cNjEOwTrN9FPXMdQJAflkwAW6JeABdhRwk7tKm1rbP0PAKpxwYsvybc0gHtvJJ8OBvr3ZO5hm975566OiNW4roD6n3hJwswBfLiAGZ5rCbLvEVji6rWDcIpPzb11C8Zju7L0PpFep53PSg/NPAnsC9kEfpgKGr/Mr518enJw/pXW7doL1FHc+qNcpAiK04iALSQ/j6zH1VO4StT85n2KVer2rxIPlnt9EKGQIet8Y3Gde9zN/E2FxkV/lcJ+53yj1TFNev8qFRWIfheQWZc7Yyz21+9m/C4dFPK8XDyP4UuHn/mfCC//4vzEvvAR8CZgrzAnkDnMCucOcQO4wJ5A7zAnkDnMCucOcQO4wJ5A7zAnkDnMCucOcQO4wJ5A7zAnkjj8AAAD//wMA8NdRQLYXmksAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.41.135.192/27</mdui:IPHint>
+        <mdui:IPHint>192.41.132.0/22</mdui:IPHint>
+        <mdui:IPHint>195.176.0.64/27</mdui:IPHint>
+        <mdui:IPHint>192.41.136.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:620:10::/48</mdui:IPHint>
+        <mdui:IPHint>2001:620:13::/48</mdui:IPHint>
+        <mdui:IPHint>160.85.2.16/28</mdui:IPHint>
+        <mdui:IPHint>160.85.2.128/27</mdui:IPHint>
+        <mdui:IPHint>160.85.3.24/29</mdui:IPHint>
+        <mdui:IPHint>160.85.3.128/25</mdui:IPHint>
+        <mdui:IPHint>192.12.247.0/24</mdui:IPHint>
+        <mdui:IPHint>89.206.64.0/18</mdui:IPHint>
+        <mdui:IPHint>130.60.0.0/16</mdui:IPHint>
+        <mdui:IPHint>130.60.10.0/25</mdui:IPHint>
+        <mdui:IPHint>130.60.128.64/26</mdui:IPHint>
+        <mdui:IPHint>193.138.69.0/24</mdui:IPHint>
+        <mdui:DomainHint>uzh.ch</mdui:DomainHint>
+        <mdui:DomainHint>unizh.ch</mdui:DomainHint>
+        <mdui:DomainHint>unizh.edu</mdui:DomainHint>
+        <mdui:DomainHint>uzh.edu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.374571,8.548659</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.397194,8.548950</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.410914,8.540683</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFkjCCBHqgAwIBAgIUezeRt262ZuEutfYIVFc7SYstvyEwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMDUwOTA2MTIzNloXDTE0MDUwOTA2MTIzNlow
+geUxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsrBgEEAYI3PAIBAhMHWnVlcmlj
+aDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzItMDkt
+MjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVyaWNoMRAwDgYDVQQHEwdadWVy
+aWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVlcmljaDEaMBgGA1UECxMRSW5m
+b3JtYXRpa2RpZW5zdGUxFzAVBgNVBAMTDmFhaS1pZHAudXpoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA368dGz9C+Tv3KiG1wG+u+0dwgjVzZv/K
+zpkzCvA3enR7wpeltW65qnXaijcyYAPIIVB4cHpbwUUuWpILUZwrS/uJta+Ywyfh
+9hf7Anw6ZdWllt6+kMV1DbuylZWsUdjYN4mJitGf76AYXa6WJLEmu3hcuyZwoaix
+ItDgH6oRpjWqtegfzD4xyPhRpD9v2R8UHyFzVyv1L9VEenz/ujUI62AQlB6lbdgO
+tx6SohfxafSAB190xYzPDmO/7WGqyW9Shr7K44SEprhvYelJJOFM5IWrTW5d+x5E
+R1sD7IaRoxuj/bG+TH1ZKC5f0777ugLx271id8C0+01YMiZte//kaQIDAQABo4IB
+sTCCAa0wdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5x
+dW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92
+YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+
+WAACZAECMDYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwu
+Y29tL3JlcG9zaXRvcnkwOQYDVR0RBDIwMIIOYWFpLWlkcC51emguY2iCDmlkaWRw
+MDEudXpoLmNogg5pZGlkcDAyLnV6aC5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyE
+CBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUXErAWk61Tl3wU6Gos0NcPiHk
+8CgwDQYJKoZIhvcNAQEFBQADggEBAGaVxEZN4nYmAtXT2B5u1PNftWXir7fXUNOj
+Chfdeu2odPHfCrJPeyUUURzn5ZnuGLkdRAzrJJuCF5Ezoz6Ukg3Za9u0NG4qaaqK
+8mW0J4JxanPMeiDBHEjZVZuzkbgnJASVDyzi1vSZmk+zXW369XdRukmSU84ZVcPu
+xNNo8pyL2NVxyUeysrhd76do+wAjzZnjjz0SuCA66ehmCMwDAWe4HA1tz+JDHepV
+4+klZ2j3lfwG8I4ugsHj1cl28+kysc/uDhQq+WCtQG5DBMRLUGYi+xIX+Kyekt/4
+GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
+						</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>
+MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
+NVoXDTE2MDMxNDExMzQ1MFowgckxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsr
+BgEEAYI3PAIBAhMHWnVlcmljaDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkx
+EzARBgNVBAUTCjE4MzItMDktMjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVy
+aWNoMRAwDgYDVQQHEwdadWVyaWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVl
+cmljaDEXMBUGA1UEAxMOYWFpLWlkcC51emguY2gwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCiiuVzv5VrRVKDKd5wGJmA+nMY/qi1Pp4qpPM4l//BhAgK
+JPWyLqybIouWSMT2YKB0HITnPm3p7iJtzMtn7YZxK5wBqYenemFJptVUuS9jHzpq
+I3blM8TKUAoTY4b+Mppgj3njtM77a4YiMqEgSnTkPatEQ5QP0g+IOEI8I67FPXCu
+m+N/EDrviVB055ZEo2W2MTJxgTzRf+dpyoOvt0aVYlsKFcXxHiIfxJxufiO5aKgR
+0e/6lSjrOqhsQ+ZFtT6RkmiW2Oidplwo97B6uIh6Fhp/O7EixF8wN3UWMCWiRqh6
+V6VLOc73rK9hE3nnhF1N+UEowvJ8pVV5EoC2tXoVAgMBAAGjggGPMIIBizBzBggr
+BgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xv
+YmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQG
+CCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0
+b3J5MBkGA1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD7
+8N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRp
+c2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFPdmvpYTb49/qkMzUnCN
+CHZqecp4MA0GCSqGSIb3DQEBCwUAA4IBAQBkxNx/LPp/L2FQRJE4XCHrH1f2LR2e
+BZsuBFBmNdAiXxNABZN/NIup7ADTTalALkY9qb0p7sYZOZ/P0mCIaQm4jrE4lXfC
+hW2bIAiqhmhW96Vg1tQt/hJdXOGwK9DgFM2VUfSrKt8MRRWpa/INWJWQIWsn1vZj
+DLrUq69KTMpWStYH/5ChSvbU6TRKRFp24y1OeMdBAP4kJZJoyocDmj3HCvz8VaSl
+kJTDI4IAgCLhzTnk7ljJI3qhaU7F9tp6iclLPcb/h3Zmzq8+cEPbRuXgTnmbSKX0
+o0HpMPl4e0ANFrH5CpAebxkqLtX1zryAm/Pi5wtxEqKwRv+3gUTol02q
+						</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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>UZH</GivenName>
+    <SurName>ID Helpdesk</SurName>
+    <EmailAddress>mailto:support@id.uzh.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>UZH</GivenName>
+    <SurName>AAI Administrator</SurName>
+    <EmailAddress>mailto:aaiadm@id.uzh.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de.xml b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
new file mode 100644
index 00000000..4ad28ca9
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-integration.dfn.de.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T13:52:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN AAI Integration + Test IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN AAI Integration + Test IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="de">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
+        <mdui:Description xml:lang="en">AAI Integration and Test IdP operated by DFN-AAI</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
+NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
+BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
+Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
+wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
+IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
+fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
+scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
+h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
+AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
+Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
+gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
+rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
+iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
+MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
+AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
+dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
+oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
+aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
+L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
+rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
+9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
+ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
+o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
+FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai-integration.dfn.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai-integration.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
+NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
+BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
+bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
+Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
+wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
+IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
+fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
+scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
+h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
+AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
+Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
+gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
+rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
+iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
+MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
+AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
+MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
+dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
+oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
+Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
+aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
+L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
+rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
+9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
+ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
+o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
+FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e15</OrganizationName>
+    <OrganizationName xml:lang="en">e15</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Wolfgang</GivenName>
+    <SurName>Pempe</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>DFN-AAI</GivenName>
+    <SurName>Hotline</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
new file mode 100644
index 00000000..8427576e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-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:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="https://it-support.bfh.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">BFH - Berner Fachhochschule</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">BFH - Bern University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</mdui:DisplayName>
+        <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="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">
+        <mdui:IPHint>2001:620:500::/48</mdui:IPHint>
+        <mdui:IPHint>193.5.80.0/21</mdui:IPHint>
+        <mdui:IPHint>147.87.0.0/16</mdui:IPHint>
+        <mdui:IPHint>195.176.3.0/26</mdui:IPHint>
+        <mdui:DomainHint>bfh.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.142358,7.244692</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.057423,7.621388</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.947922,7.444609</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.946692,7.391228</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.991818,7.468039</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.145776,7.219669</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
+MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
+hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
+5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
+2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
+b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
+c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
+MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
+s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
+WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
+JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
+M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
+2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.bfh.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAJVzWOYGQeKsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTIwNjI1MTIwMDI3WhcNMTUwNjI1MTIw
+MDI3WjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnwTKlepv4n191/BElXAMg/u+2St3X4T7Jyekhs0I
+hjOnVrhZg/KOmvpPGnaCEZwdN19Lstq4Wqt0PTJk0AkQn/NWLc3+lTJREQJ8G+hU
+5FAdySCDu2bOrgJjD4Bl7hUN0k4W+bkkdgplvcqXERFqt368qpu2c1lRAEwJ7Tn8
+2XxjoP9rOUpTTW+XJh5g5CK2V9BBPteeVf5Gfwe3/xiuQ4LuHsGW8vFLEZPEdIWD
+b9dPuO6WzmqFon+RxAwwUm9MgR+Fgd3vSqYINZFmOJ9kvEONK1hLv7e0a0MX7BhK
+c28dy/3UBhLZmNfiko8gsDR11rvaEw6GcONW2333o6VKcwIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFByxTmSn9QFnFpQCJWhgYfKAc3bk
+MA0GCSqGSIb3DQEBBQUAA4IBAQAOIELg4Y21HCefARPwRAhwB3XTRAdoucBQt4xu
+s8UC39Yuzi6Eh6SJieGAm9ePLTpNFSH3jIqAiQyxH33jWZMSb229ByIGzbHrm8K7
+WLFuqcLltr9vdd6l1RT+hOt5wPRNQhWqDkWuBRDBZz4WHq3QNypCzSHyvLBYoahb
+JYkfFc6kusMIqlwnGzfxO450QRAdnhf38E9N1iz+nGoRNT+5xwVCsP/bdUVAyYNr
+M2r2BWHVZt2GQD4ZsRgLjtsaRoyobIN2CWhOVZqnlk4vbXFXlS++TwtBzJq8HKft
+2EhVU1pz8jnpJ90P3Nyj1HNw55DR9pn7DMQqIdSAOoyDkoXY
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">bfh.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.bfh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.bfh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.bfh.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>BFH-ITS</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:it-support@bfh.ch</EmailAddress>
+    <TelephoneNumber>+41 31 848 48 48</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI</GivenName>
+    <SurName>Admins</SurName>
+    <EmailAddress>mailto:aai-admins@bfh.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
new file mode 100644
index 00000000..c9f5e094
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-13T16:19:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="https://aai-logon.hes-so.ch/idp/doc/ListeResp.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">HES-SO : UAS Western Switzerland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Applied Sciences Western Switzerland</mdui:Description>
+        <mdui:Description xml:lang="fr">Haute École Spécialisée de Suisse occidentale</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAW0lEQVR4nGL4TyFgABN5qxECSOyBNQBEI2OcYvgUYzOUdi4gxjYUm4kxgGgXUAJwGrBl9UI4Rhcj2gBcfGQ2A7Igsg3Y+HgNIOQSkg2gOAyIBRQbAAAAAP//AwDivI9ii0QGKQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAlCSURBVHic7Fj5T1zXFebPqJzYDhgDTuV0r1RFjaJKTiI7UtNKbdJFXRSSYBsbx3bSuI3TxrFpUlsywanlpo4NMwzGBgzY2CYsw7Dv+zKswzIwLMOwzDDAgWHc892ZNzyGYUl/eXkKSJ/evHfPve/c731nuQQ9fvw4aBv/PxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDtW3Zis9rRms62gzmQtrTGNl/VP2G/7T3AzesZmMoVdn8duYMKxxu6bglU3r13Opb3HkynsWDLtPqyhE5py8oy5fTau5eWgQ/98QGFsFx6TTLuitHRKW0FKb+RrQeAv//WIgg9rKfyYjp5iYs7eqVpDDAg88OE92nM4icKjmei3tPTXlLV23xT4EZhDISCGFQgCz92tCUCgO+iFc/cp9GgSRcCOCfwwvXabwIAESsS4ZSHsWvYQeAQK1NHuKBmB7tW2APLlw4YBc2JxJ+lKu6jIaGmeW1y6hDG33Na9MgfjyK/p1SZbAs/T8jys0WGZyp5dWPxKG1xaWvzE4XBcnbBak2wTE9rZ2dkreLaevdu9fH5ubi5uanLyJuZMT09fX1xc335DAj+6W7dGWdj0C+fu+RS4ikDkSi8pHZbp7OibpfT9d+5QCJP9FKeGEIB//zouj+r7rUW+ObKPlNdsNr1y8RHti7klfAnm9YE9PO/bb6fQ0Rsl5PL7SIGJW4o19fbqKysrh4sMBoe+oICA4qIie2VFhcVsNt/3nzM2Nna7ob6+s7SkxCbZGwoLnbDv7u4uIqKLWyYwmK/vpVTSzBxdcdLiZSctXZrm35ZpZ8LP/p61DoEeNAxYDT/9IIN2vaWhsKM6QRpyKxDGqg2O0tCz72dQq9mWK1diYfuwcf/JFLbTiPwaynNR0PadSOE1tLTj9QT67af55N6EwOXl5fNtbW21IKBQr58vLyuzNou/plaQUZCfTx0dHRVyUfT09BhAFuaAwOamplb+q6/iDyCRWVdXa1pYWLi0JQLDeAPPnLpNB1htL3PVReU98NE9sfF9x28xeTqB3UyGnED7PMX//GIOK1gjxkHCH6/qKbO233oxu5H285phovhoKJrVtOx2nxeb5uuf2A7r4f1Q3MsfP6TSztH6pkFbwV0O599fyafTus0rvt1uvwalgbz6urruufm5OGkM4TgyMpI2MWFNkisP5MG+uqrK7HDYr8ntjcb2GoyBxE4Z8RsSGCFI1HnCzqsejGFjnnGdL9TlBCJXhRzxVGjYvnQhm+zzi/HS+BlWNRQIZf7g3VQatDmS8XxhyfXJS7HZFHo4SayNd732aR6NzszdlCtlZm7hymYE2my2BImQFtbdRorFWGNDQwdsEeqY62+D0IVyYVPGaparcEMCkYe+yznMg1T6HgPXCO94uDeEz9xaaWPev10l1BXhVdErl3JE8fjsyxb695etFPm5gQuQTrRKodFJlN861Il5XN0vvMp9aHCUxrf+Xib5J3/LoJiEMrpX32+RfwgJKArDw8OZcpU5nc74kuLiKZAIUpoaG42wwXN/MkEGQlxSn8vluhCIaKQE2GDNCS5GW8iBWjrNDfLQ5GySedKRhCtgGrenPf9BpghNicDT2nIfga//xyDmrpCQJMIZpKJnDPFWb5EL+V0pFT1OaW5KeY8TuS7Uq3KQ7JnP8/h6iENa3zbcIQ+v6urqAeS0Og5Vl2spVhrr7+vLNTB52HShNxcitzWw2hDCEpH4AMVFxSLcUUDWU6vJZCoQazEwf1MC4fT5jLVVGHiR2xgplAWBSZU+uz9fKxTE+FTMJ5aI48nenJlMT8ek0NMngFsUxgrXlXfP+8KJgZblOS5AouggH0brfGrHsx+9l0poZ2A/Pz9/ubSk1KZnAqEiosVVVRJKgXLKy8qtUkhLVxSNFQKLfASuF+oDAwOPpPkjFkv6lgg8F6BBlhrpPV47qOokh5g0DjWKAsKkIXf+Lj6fTGPT6d0jU1ndI9NZPaMzmb183zs2k44ztGOe4kQL4172vWOEK31KRbczkj/GMydvi3wpKXrXmxqRCiTCh4eHspq4Yo6Ojt5Zb/MIUxQK2CGkQQJIQ7HAGJQJcmpravpQwQOt0dXVVSopEGtticB3dJXrE3hkhcCYL0p9dlCQVEkRpigUVb3jFYGcGrTNBi3x0RBh4+Z+kO+TF13LsXIbhOx3ROXWedsmDcWuExmbAe9BKyMpaZyJwLOamuoBPEPeRNO9Zh6Timou2UC1WyLwbU1ZgH8mBCDwxgqB6BOfO5spxqFC9Is//Esqb7qecpoH+/TGYePnBe30alyuaI3QW2J9JvLCb+LzKPKagfTcD1qmnNopJ11NqzJN7T/paX3CvQRe5/kbEYWqaeEw82980VwjTA1eAif5tCHyZX9frqSuNu79/AvJEDfdRd582uxX1TckMOp68dYU6CPQs3BmbZ81QpwktD4litMEh+LeY55G+sk3Eukgtzjzi0tik8RtzMGPH4jne9n+x2fS6dmzGfwRdCIPSu96/h9ZZPa2PvLjnxxSXkMT3NnZWTY4OJiNIlBXW2uSmuWmpkajFK4oRiBWOnlAbTipoHK3t7fXYC2MoYVBjyl/16oXH4p9QDsiE8Wxa8cbCfSHzwoCKhAKe+LNRNrNdt/i08GR/xbL7Dy2DxsHBw7yeqG8+V1sC+xkPInfXJFRxU9xvpQaaRD4K7QxvOZOznNPRCYIYM5O2PM6v+CWqL5POgKuDxBYUV4+ik3n5+X5gGoNJbW2tDT5nyhwbzQaqxGisJPPk0jFudj/XatucprMfWgrUqt6p9Kqe21lXaO1a/PI46D79QOWlMoex52qXjtsy7vHagJtBOGJ41mioYNu6I10o8AortriLqrsGat2kmvVJsZm5r7IaxnqTvCzTzR0ksFoacVxcqv5Dv8QGB8fT0b4mQUGs6GoGSbBvSH5jqtoUzBPYGgoC6G+Xn/4lRPxNrYJ3Cbw6wTFHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0DtUNwBtUNxB9QOxR1QOxR3QO1Q3AG1Q3EH1A7FHVA7FHdA7VDcAbVDcQfUDsUdUDsUd0Dt+B8AAAD//wMAZtOP6cvUNwcAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.12.0/22</mdui:IPHint>
+        <mdui:DomainHint>hes-so.ch</mdui:DomainHint>
+        <mdui:DomainHint>ecal.ch</mdui:DomainHint>
+        <mdui:DomainHint>eia-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>eif.ch</mdui:DomainHint>
+        <mdui:DomainHint>he-arc.ch</mdui:DomainHint>
+        <mdui:DomainHint>heds-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hef-ts.ch</mdui:DomainHint>
+        <mdui:DomainHint>hefr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heg-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>heig-vd.ch</mdui:DomainHint>
+        <mdui:DomainHint>hesge.ch</mdui:DomainHint>
+        <mdui:DomainHint>hevs.ch</mdui:DomainHint>
+        <mdui:DomainHint>hsw-fr.ch</mdui:DomainHint>
+        <mdui:DomainHint>hta-fr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.996710,6.936891</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.793393,7.159078</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.207325,6.099785</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.293093,7.536841</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.379599,7.626590</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.235924,7.351375</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.287826,7.884015</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.361332,7.345858</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.779445,6.658656</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.526928,6.627963</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAMqicqA49UbTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5oZXMtc28uY2gwHhcNMTMxMTI3MTAyODUyWhcNMTYxMTI2
+MTAyODUyWjAeMRwwGgYDVQQDExNhYWktbG9nb24uaGVzLXNvLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkJvxk2Aq0rv+KSKYZmat+KfRDoPngFG/
+q7vy+R2o3+em4jUkOI+FrKA87fGmVUTCTj39s6ySilxmeyDppzUG8OLcXYVR62gl
+9EKNAsaDAKLyk6+5EKrD92lgLJqd8mUkFEMsp8Vmp7dfS+3mCrFu1eUC5GdPc+aF
+xf1u+vjP4/ETBU13MNzacsqcXlM0ArPIp7oWrDQnrs151+2kZt5YgASyqtlv6Tz5
+8h153JjL4rkrVSqF3drEFZLN3Qu38zyUrPOYIv9c76lCQ6PUsq875riXZffIcdfP
+dlQtuRuOGnePrs7TP39F5ToJDR5dKdswnhyrgXsTTElkU7UHWlUgKQIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uaGVzLXNvLmNohipodHRwczovL2FhaS1s
+b2dvbi5oZXMtc28uY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLPdE7npAe4X
+MCJJ2tWOvKkGDRwTMA0GCSqGSIb3DQEBBQUAA4IBAQAKmIgNATIcA64ve8grxWDR
+cmBxDOoyl4m7zgaOz5TAhL65R3Ieb1wpvFYfIxtuhR3eSbcTYmD7A6BBp5C2QXZa
+2twKtrGfo/WJMhas9NNhthnZQDYpK/1E54nJPNAKY0eZUnh9QCEdcKmLh9TOl6BF
+eYrPRwFJZSV2pBHhXCaO/aEtTvrL7+DnDljnhb0zfBJ4TCCGnQ/MOALNxt/ZkKz5
+QYG9T2ud56O8FIRDi+rCME6nicN5HF4FVFA3Um8q9WED2vQ6mztFY9y+glOHdRqb
+Hpx/eGHluuFsDHUh9eaXQubano3fjXCVFAhHELlqLWa4uEDyoIQ6RID36NV3V7Ul
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFQjCCBCqgAwIBAgIUbQvY+OJqikCxxhTbXiF9bamtIiEwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEzMTEyNzExMTkxNVoXDTE2MTEyNzExMTkxM1ow
+ga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJhMREwDwYDVQQHEwhEZWxlbW9u
+dDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lhbGlzZWUgZGUgU3Vpc3NlIG9j
+Y2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRTZXJ2aWNlIEluZm9ybWF0aXF1
+ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbsalJikrnHoy6SzdmAV13SR0QA
++pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLgSmAx4sqX0WZAYho20gXDY/Rl
+cXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I/oo3kpXzcmsdBx8ZFyz6YIod
+e7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzWCsyyNTpxQWKnEPv4mfjEiyC3
+j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6dEgyuawkNEIqXWaKer+hMoyM
+xAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n//ECAwEAAaOCAZkwggGVMHQG
+CCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNn
+bG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
+YWwuY29tL3F2c3NsaWNhLmNydDAeBgNVHREEFzAVghNhYWktbG9nb24uaGVzLXNv
+LmNoMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
+dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
+BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+gBQyTaFP6vCumbbumwcshAgRUIvifjA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8v
+Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcmwwHQYDVR0OBBYEFAX7
+qvdL23DqegSmlCxsX+LERI0AMA0GCSqGSIb3DQEBBQUAA4IBAQBK7qy3M7LVDRUz
+B4szCrhGs4SG5/hh0ZvjSseJaKPwVvqx4p8TdVfuo9VANqkmID1O+lgTBSmNgxai
+xJkCMalwtZDMTKT6SSYFi6khSiYxHDa5NcE7W/SVn5bf5FViuF9P0JeMKnLt+vzF
+wGYTdkdOoOjskmuZmGJhf1VGNtxZ7yI4I4claTWS/4XxAivHx44MmITQrQLLhQZR
+Bb4WgjlWX1X5Do9/nCqSpOJ+QpPb6PRLzsBazR1nwaTVqn7IBTXESQaf3KCAaMUx
+AGxVxS6Wr+7y0NG4xKIrpn+NBa7Tl/KsLcvH8PbmiGa93EFJtbENoO0ICT+2SQQh
+JT6DgiEX
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">hes-so.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hes-so.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.hes-so.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Equipe</GivenName>
+    <SurName>AAI HES-SO</SurName>
+    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Equipe</GivenName>
+    <SurName>AAI HES-SO</SurName>
+    <EmailAddress>mailto:idm@hes-so.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
new file mode 100644
index 00000000..07f974ca
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-25T14:39:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://www.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWITCH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">SWITCH</mdui:DisplayName>
+        <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="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>
+        <mdui:Keywords xml:lang="fr">Zurich</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Zurigo</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAgFJREFUeJxi+P//P8PHXd1nfj484w1ik4rBxNsVeR+f1Kr+/7ira/Pfr++USTbg3aqCj4/LJP8/Lpf6/6LP8ce38+tb/v/7y0W8AWtKnj8qFvn/pFrp/+NKOTB+syD+0a/HF0KJMuD324eS79eVzwd64+/jCpn/T2qABgHpp/Ua/z9sadz759NLbbwGwPDP+ydNXs+NPPK4UhbsiifVimBvPe+2+f3l1LL+f39+8eM1AIz//mH8em5N5Is+p0cgzU+BhjytAhpWIf3/zeywF7/uH08EqmPEbQAU//v2nuvnockNj1uMv96r1vh/r0bz/70K5f/367T/P1pVc/zr2+cmeA348+8/49KtZ8Nt/ItvGzklvzd2SX2vZ5/0Xtc24X1xWevVp48e+uI04PCZW0YeKb2HWLWT/7PopIExg2rif1WP6p/z1x/v/P7rLy9WL9x59EoivW7hXF6jzL/Mmkn/ufTT/jMBaRHz3P9VfWt2vH73WR1rIL7/+JW9a862Mhn7oo+MGolgjSDb2XVT/gflTLl3/trDALzRmN+69DKDcux/Dt3U/xx6qf9BhhgF1H9bu+tM3b9//zkJJqSEyjkfGdUT/jMBNUpYF/xvnbF57ftP3+SJTsoJFXM+MgM1x5TOunbj3nNXkjNTet2Cx/PWHCoGsllJ0QzCAAAAAP//AwC4nrtuPmwfNwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAiDSURBVHic7Fh7bFPXGT9x4vgR29fva1/HsRM78StODE0CCTQoJiEPh7wgNoFAgkt4jpF2/aNTira0/2za2qGC1IcoUwlTaaF0XRJRaLRB2QCxTtAHrxUWNfQBnWAPprFNNN5377UTO7GzKop2dKQc6ed7z3dev/O73znnO0aRSATNY/bAToB0YCdAOrATIB3YCZAO7ARIB3YCpAM7AdKBnQDpwE6AdGAnQDqwEyAd2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkg/9hk1jlkJvKX1LmN/9B62y/oXe03YTnNWV+06CMWbQBxSWpqWKv0tZwRiBjsnlLWqwoU5pTdUJhrdmPxBRnyFYj40AbdbqvSvyDWKUMAf/sKBbuOhpSXgiXiCr4AimSWfw/zzJXvslmTSZaMDh0HF4azirtjROgbIHJdwBC/rNjtz5ndj/9dDxNeZZh4ePKvLphtXP1ZXY+eseqm1oAZVkO3E01PPX0iQbpipx0hS0wLNF5f4pSJ4HcunwPlVf7m0kBhTKruqDlnrE4/GfaFTqhdwWPAF7Xu0Lv0O6Oy0zxY+OqvLonYj1IDAvLmaLwA2Ve/YF49TjWpvLHmeJND7OYRT42v69B8coXu4x3t5aJLJO1uCbG013qu3/aYXzfbxcIefkppHevOatxrPqIE5DRCYaG30Uor31E7w6NAJ8R2rP2gql4U4T2rPuQzbNAqGnk1q0vmN27owJKNLS2oPUq44N67rW/h7kMAQ7zcwoeNRZt/BjGuYfkZiaeu1DtRFA2qjRV/HIGAdNBo2Gjp/OrCQFlzOKfMb6e/8jMj1qTNBCq7I1XjEXhy0jtEMeMKlvgFaZoYwQK3TFRokqmaR2rryBn50ethXTZ2E46sr9JsYMtEAnSkCj6wXcszuy/08tE9tYrOE8QcSMpkM4VOqspaOUEzMqSokCgkX0DcRVcO5G+uIzxdkUyjaXNvOi8vaurC5WUlHDvytyalxjf5og8p7I6Vh6fJMYSZIL5yC3+XfH2DHUBCNg9Sn0LAWlXx+0JAZW5K44bvN03EJWbtIVYW/gdjX3lC0J1wQQbgdrhhsH+qbY1Hp6omMavTQFlLUL5XQ/fWOO/fX0b+sRKIyk3chovNOSs58Pav13ZQg/bDSgjap0m4MTE4ievL65kvN0RsaFkVcwmEsbVhQ8E7c/pXMFLKSUQyhHt7RrS2JsGEsaJCvhtPBBWZpyAeXUjBu/GsXSlfVrtNEFGooHL875G5a7YB0t5XKwrijYEe1pUD0PtW4fXBR7+uBpxHpYJE4t5X79feuDuE8w3/VXSIjYvjg2RQsD4lEzAqUnnaLuoLWg5g6ZsL/FJZCqvFuuLl8TbZi0g7FsvmxZsHqdya5bM0BClTWy4UV4yo9ZQuOEvQPjZaZWz9Ez9I4+8qpfxWUFsKkrEXOrR37/YQx9L6ItNcyUgtIc98H2UVMApJsGk+3ICemEJM2VHUvXNdkC7gr9KEBA23VwgPQLqfw0F52nXml9DpZOwmb+htjfuhz2lP1NdYOKbpyf0BifuNtisx7KMJcqEcqnZ2bV00YFCOkouyvvFgOL5r3tNo99bIub6E8Z3N2ceCAI6UgmYOvECdo3CATWmcQUHNa7Q8WlwBgdBp6/AC28nhjHpEiShfWaFeVm50lpdq7LVh9S2+i2a/OaXjd4N9+D0+xgpLFmTw0W5STQIBvxA71n7KhIpJwvpunNHOxvG99ShcMzoyUaqT7cb7ox0atsS+oil/4MHCoXCafVjtpiAEOqchgijHUK1oNJWPwUN7aDHB+BkUwSMS6KpeXphH1McjsjNSxckFES9TcaUP2ny9UQU5kreSylrLcrvHn9nfe39G9vRlzoN4hbyay1U/+1dzM2e0kyOcSwenJzJHAroaP1tqnKfz4dWrgxwKC0tnbDHLeFjqdoifgkPJSzhgYFD5oFDvzAfPHgQ+f3++Lr8Q25uNng6I5S12p+0ywypSe/uGKcL178JMaUATuzryNl9fWeFfcWdXt03L9TLnlqahyy3djJ/PRZU7U5JbY4E1DraLgHOpyrv7e1FQ8PvoWFAX1/f5DRme4g8tuX7Fzdtf3Y0HN6MnI786U0UlqCxcH2EsvgfnVYW9UIIrl+EgDuidrQ+B8HouCK3toMtPbFOc+raNvqzobXKPWM7jeONbuThWEz1PjbNkYBsGAOB8rVkZTKZNPq2fC9CNSPsm1zOn3SzFhChiiOoIPxvhEosyVrIc5a9DuI8kBrLbDN0bNA5V0eyF2yJGLwbbsC1iDM2eTJ8n3/XOH7/SVPkYKtieIb2cyYgRBN72S0ly1Q+/YNDytC62b3uJNy+EpZqhmqWgTQs0WVaV/ABeM5nsHfs09oCz+hsDc9o7YGfgCin4MbxUFPQ8hoSqZKfatEAWqwv2gM3FnapRyfHeafg7ZD65NWt9D9Kc5CLs6Y6G0Uq7iqnjV7lkiWJ3ldp8m6MiI1lKQVEYo0BlvB1mM/fIcQ6pLU1/JCbj62hHw6X50G839GFnf8S633L45sJNS4Ece2oMvt/COgODRs8675MPEQk6jJ59tIBuKKdUzlWf6JyBq+oHKsuQf6EPHvJU0iskvBipSftNY0XUSGzNZ5KV/COHFumWxcLyw6FpIOcbQZm7A2B/TNBlrMsZRwmVNoWULl1Z2CytcmJREcQynQwn32qgpYLKteaPwI+VTnbr6rymz+kLFXvIsrCRQLxF4UMyiqg8uqHJFrPj2ZgKZDnVD1H5dW+N/931lz9nTWPeQHnBSQV2AmQDuwESAd2AqQDOwHSgZ0A6cBOgHRgJ0A6sBMgHdgJkA7sBEgHdgKkAzsB0oGdAOnAToB0YCdAOrATIB3YCZAO7ARIB3YCpOO/AAAA//8DAB7/hgVtBuDqAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.switch.ch/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.switch.ch/de/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.switch.ch/fr/about/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.switch.ch/it/about/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.59.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:620::/48</mdui:IPHint>
+        <mdui:DomainHint>switch.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.37333,8.53111</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
+MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
+Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
+GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
+cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
+acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
+HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
+kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
+06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
+iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
+qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
+vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
+pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFVDCCBDygAwIBAgIULqFVZ3v/ZWU2QoNe1Y/XyQSqGeAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTEzMTIwOTEyMTgw
+N1oXDTE1MTIwOTEyMTcyNFowgcgxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsr
+BgEEAYI3PAIBAhMEQmVybjEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24x
+GzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNV
+BAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEc
+MBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKplsvC4tYqZuV9IOjCWn6r5gMxMnmJ2EVZkMU8SSW4To8aB
+/dhPc8MUkHQ3bQoew4iolSzBdQ8dCeALCHQLmHD5rqXsRvsTjtkPS7SjaEM4viLF
+dz8oC8Y3x9RA5ruZf5KKPh6f2Dd/1s0IKpf7lPJx6px4ho2QwnOmwIAe3+QWrhK5
+136hmtyObl+rDDkzCwBnir6BXYEPHMSXqR9u9McfCXHjw3qow/qSv2+Ae4lVHh2K
+fiNbFTMa2t5zF53NyQNbK33ckrAJ1R1QcysBT3lyPK4wy3IACZkR2S6Af/GLGE5y
+DWCiwZqKRI+TUcGGHNj7+GEFCfdfHgY8og8Rl/MCAwEAAaOCAa4wggGqMHMGCCsG
+AQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9i
+YWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsZzIuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYI
+KwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRv
+cnkwOAYDVR0RBDEwL4ITYWFpLWxvZ29uLnN3aXRjaC5jaIIYeDUwOS5hYWktbG9n
+b24uc3dpdGNoLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
+Mi5jcmwwHQYDVR0OBBYEFO5qHZPNwV4RRgjWgE/kQYdVOMgYMA0GCSqGSIb3DQEB
+CwUAA4IBAQAwEck5/yI4crrtFbfMDQzqBCXVQqLQPLZQuy6LcltubJgMY2gixwUk
+g11zTpP8ydZWUzZJ4TdmJwQSxWOiHrmrkpXjPMJ/NKCS7VUjsR9qSLDeJzEs61E0
+Pk8ssP/Caza7B5kUoY52NAfgCLyqGNNqDSCM02JD/sUIF4T5+OiVaDDzKPdBkOHE
+Rei3SQPXcLygCnwaXVWkmQLoqXESIXqmOwbWoACmBolMHKPGzp/4rvp3ejPUwYru
+FIwRkLdxvdKOzE/feFbX4GkXgvg6GmELxSZbakbuQoNeS/aTLYR2Y/GuE4UrA533
+Sih8+vYwOym3ZyV+cdIM1uoInD5lJmgl
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAIHilzMu/j8KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTMxMjAyMTUxNzI5WhcNMTYxMjAx
+MTUxNzI5WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA72Gf8Be0k33Ucdk6+m/wpe70eZdL8n9Q
+Dk4AuJ7uLFqo9vfJFRpEDbfGAt2s9esAfxX0harLVhEP7bX4HQxDt7uM9PeDXZ3M
+GGiKL4hCNR4RKY1pfx7PoLDHthiO5vVgQzlBAis3R24kL1omDGcHaxuazC5esJ5W
+cW3utZiVvmuLyysAuRupkMsLe2Cy4nEYA3IKVjqJskTACOyBhrv1TjJyVHgUPfqk
+acqMwIHL9fVmLpJwvNHd43btsx4RWtyTMeHxN4N09LnhUP7xlJZeFTgCW02Aqz8J
+HMzqwDJLBmSo7S3tQDUcoID8wXjjC0FH2WcrAi+A6mIaSwweXPXI1wIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKCIdiqWvBra
+kKosFDkwV2lqXHPPMA0GCSqGSIb3DQEBBQUAA4IBAQCebaL+8PbVVbIpGsr+ZwvG
+06XdJYWW6adQiOy110041UBodrjqi40rsqfJjhysrNxW9eCyVhJ8tq7Q/QUI6KHJ
+iOOciw+p2c2KNI1nq54Nebjkal+hTbUvS8N7HTMvhYdu7gqqDgnvgP7s3iFAXI5b
+qyPh4TWKXlb45GinyZ3T8OjB6UsHAmhn1hRFuwOa27csxu1qPvFhTgEgbXieo2Nr
+vmIdMu967nRbVMztmAfd7Vv0eMj+YoKuA/RUWqJI6lMjHVpkl2ggE/Kb8mXX/wX1
+pSfkm5o6j1ysHdGdoojvd+BikyPR7hGEs1lukWxump98WxdIHzmo5ErBr770nWRR
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 1505</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li.xml b/swamid-interfederations-2.0/aai-logon.uni.li.xml
new file mode 100644
index 00000000..1f3ace59
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.uni.li.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-09T10:10:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Liechtenstein</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Liechtenstein</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Liechtenstein</mdui:Description>
+        <mdui:Description xml:lang="en">University of Liechtenstein</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAACRJREFUeJxiYBgFlINdalL/icG41I4aQKIBo4BGAAAAAP//AwAhn6eucY32zQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAPLSURBVHic7JjbS1RRFMZXzjjOkDRqOmlY3siI0qDLg1Gm0cUoTI3RsgyjHiywi11U0lA00zK7QC/1UIEvDURvvfUQBZHUS9Hfc1qLvY5nexzRYpjVgtnw42zPXvucb39n7YsDjuNAhn9HXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHbEBWhHXIB2xAVoR1yAdsQFaEdcgHa8SqbsRfYh4ZUELzKwOT+cSBWtBeFESShr/mV1uaFES8HSsVXhYJ2lbcSqX0VKkFlrkAeRC8gmpIvv08tuI/eYk0gcmUamkKDVHkF6kRPIG+Ql0oSs5zqVG8gHZAKpWpGB32uKnFTxa3vMaYyG5l/2vDzP+VkbSxr7G2PPFEbilrZpqz6EVCIzPMgG5Cgbu5oHCHxvNxvklvNIEXIZ2Yjcstru8LUZqec6tXfyh6Eymcy4JQ38vLXQSRVzaEz9Gs/Ax2VR59u2oqSxZGLH2mUN7GCzDvgMvMjm3OX4GTaH4rqRR5bJZNQYmGz0G7gKTIaGLKPVGjjKAwE2xjWQMuMFmEx0DcxF+pDrHD9hPYcysNj3PFrjWpMYeAh5iIyDmdYBzQbSWkSZQ9OxESlFDnMbZccOMFMtYpkW43o/MoycYnNoCm9BjrNpFBsFk7nAz9+FXLLeXwtmqejTaqCKknYD59DAL9jm58diA89Z9bNg1ieaojfBZAxN3SGmyYrPRtrBZBftppStm5FnXK8BL9MakA1ID5iMreMY6ncFaQGzJtL714HZ+fcjp7l/W1oNnEEDv6KBn7DND8W2LzRwxKrT4OiIMuBrz7P+djeQbPA2AHctzAezC1Ohqf8aKQMzxWlqT8HC4vbr4+cBx3dxH9rgaAm4llYDi7MD8cqcYLwiJ7AIPAPGo4Gs0mUMfAomA2m9GvcN+hW3DYC3bt3nKxn9no3dAyaTxtiMauQYmE0m19ePNqlBpM0ysJM/wkDaDfzLkszAQeveA1/8MF+D4GWga4SdgTvBTF3ahSnTqvl+HniZ5/ajD+EOwDaQTgS0DIz/zwZSNtGO2c2GkIGTfI8yho4zT3iQtNP2cz96YS/Xx/hK0+0t9z0C3qH5HVIOZh2lDGzk+6N87eE29xBOayv9d1MBZk3+mPkxIdU/JmTIGJgxUCPiArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA74gK0Iy5AO+ICtCMuQDviArQjLkA7fwAAAP//AwCc7vsetROpDQAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>195.176.84.0/23</mdui:IPHint>
+        <mdui:IPHint>193.5.26.0/23</mdui:IPHint>
+        <mdui:IPHint>193.5.26.0/24</mdui:IPHint>
+        <mdui:IPHint>193.5.27.0/24</mdui:IPHint>
+        <mdui:IPHint>193.222.112.0/20</mdui:IPHint>
+        <mdui:IPHint>193.222.112.0/21</mdui:IPHint>
+        <mdui:IPHint>193.222.120.0/22</mdui:IPHint>
+        <mdui:IPHint>193.222.124.0/23</mdui:IPHint>
+        <mdui:IPHint>195.176.80.0/22</mdui:IPHint>
+        <mdui:IPHint>193.222.126.0/24</mdui:IPHint>
+        <mdui:IPHint>193.222.127.0/24</mdui:IPHint>
+        <mdui:DomainHint>uni.li</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.149655,9.516456</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.uni.li/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJALPA8rj6XmsNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi51bmkubGkwHhcNMTQwMTA5MDY0MTUwWhcNMTcwMTA4MDY0
+MTUwWjAbMRkwFwYDVQQDExBhYWktbG9nb24udW5pLmxpMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA18QaCQt2hS2ln2UCEUZfRP4hnA6hx9VBY1qM0coX
+VawizlgqcaejKFZ3EEi+YlbrI8oqT/XxHfrN97TMMfzbfjpe4yfTO+4qO4kzLquv
+rUBc9Lz9zFn7hwFU6FkOL/ZHfRbztDakuehMi+5l63z8dIkAgS/HC1TsYX1QTnzF
+oZfESlJauTysw/ScDNCF9gnN0NNh1wzsWzguHue14kuwbNVpEcSuV7f6y115d+aC
+ENcifEX4jXQ02QpRb0aRebPEW1waVrUW1oTOhAzQ8aoQw8oO8zNGYAA36FN98Alt
+kib/Fc8e7geFgIdMwmd7sDMlwJr6hOzdJkDJTAZZaFJGXQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24udW5pLmxphidodHRwczovL2FhaS1sb2dvbi51bmku
+bGkvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL0xAMbCNYPb2WYBXyVIKNyIzPd4
+MA0GCSqGSIb3DQEBBQUAA4IBAQAAyrTtR1axJmDFepwN9piRyxwe25UjL7OlSKoN
+qpMUDlkEbdmQUg6UODYXC1mQ/QfuPnTDikj2zhr5ylfFSDYPj2kHUyOTN2koTT++
+g0s3ZNe5ly/e+JH1jPMAWLujlpkwflM/lBhgIA0sQXwJEDxigxuqm34Hd8jZv7h8
+a5Sf5EDutKrGtwIfDKSvBynp/cibY7H5Dse/EE4ktFWvMlMDaXPVOWqpzLTb3bIa
+NMeonKCuSuheHvNi2LPf6EyZLALj0VtSW5pxqlhOtcHSlaojESKTL1IrUy5pUmnr
+/LVDLvHUtsJPKNVR2iL2CUFeYjUoh4s2cZPgdMs8Q+XDvVL/
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">uni.li</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Liechtenstein</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Liechtenstein</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni.li/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni.li/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>AAI</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@uni.li</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@uni.li</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
new file mode 100644
index 00000000..feb0ec5e
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.wsl.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-10T12:27:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://helpdesk.wsl.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Eidgenössische Forschungsanstalt für Wald, Schnee und Landschaft</mdui:Description>
+        <mdui:Description xml:lang="en">Swiss Federal Institute for Forest, Snow and Landscape Research</mdui:Description>
+        <mdui:Keywords xml:lang="en">forest+snow+landscape</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">wald+schnee+landschaft</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAC4gQAAuIEBxcbWvAAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAolJREFUeJxsk91Lk2EUwE8QQQTRTTfeFHgjEWlEdNNfULeyu4z20dyHbtOWOt3XO7fpNPuYZCbejUhNJWLW1JQsE+tiBGldJahD+gJRc+6hOJ3nPEPa2sV53+e8zzm/8/kCIkKxxOYXtir7HuKBgIbg1fDk7XvofJESP3azWrFtgeJIvRRguI5gNCM0tSIE2hE0Eo8PodbO56r+QSwJqOgfUMaNzeQYpnNU6UEJIT0YQQiF89/CWACoHh0X8uJgNIbHunoQ6huVoS+kHLV8JgHlDBY76p6MCQZ83dnRZMrFtUXmXot9R85GZkHAtgBCcxtCixd/CQFQPTzKpJnV1Vkw2ZgOHi/G371P/9zLwtm+fGk3W7A8fh8PRzoRWr3UExtOr6zMwuZuDl6trSW5cUQFb1A1zVDL+ptMJjm0tJwGWz1BPDi3tp4EpxvBZMX2+bdCNUJGbvVT5ym1OifTWfeQ6E2oGx4T27kc23789j0BljqUUj85JWBxfSMBJorm9uDxW3e4F4PpD5/BRiAzGYaofruLS7j8aIjqpyx9tB9X9Ph46VMaJr9QHWYrSkhsYXHr30ZW9D5QEJmZdHK5VSNdNwjq4GCwuZcDTpkg+mdJUTyN4WWq3+FWIDPZ1RgQrplwY3s3vr8HPFujBcspYqnVlrKYySSaUlOieXqmIAg/7M9TAvQ0hToXAy50xjD35zfoBgYwS7PWJxJ4LhzG89Eo31+K9xZuIh/8ND69WqiL3d38Pko/kwRU9txFaHDzN6mf6ej4H8CKlTpfY8SGkRE8okV4XeXWhSYmcvK+LBxRGXZ1lQZIuTr+lGusyhuV0RbK9wm/H0/FVGaHvD48HQzy+S8AAAD//wMAwcp34AlJRawAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAA+FSURBVHic5Fx5UFXXGf9AxIiKgsQF9w1kUwQUERQREBFkk8ciS9j3fRcBFVGzTtqk0ySTaSdpp2nTdPqHxkwTp7E2yUyadFKTdCadOJqamqY1TbOYuMvrd855595zz733gSYXcXqcO4977r1n+d3f932/s1zBbrfDaI7/tzRqXO4YgC4uRrkeeITB/IU54LeyHkJCd8OaiAEIDu2B5f61MHdeOl4PwWPSKMu77TROAcROTpggZsyDJctKYXPCM2Ar+BAq6m5CY4cd2nvt0Nlvh+69dujZx37JedtuOzS026Gs5hpk5f4FomOfQFBzsZzpSona8m87jS8ACTvc3PjZdJi3oAqSUk9CRf0wdPTZYc8BO/QfZEffEJ4PsTz5INfIwe/tHWSgllRdgbjEF2GaZx6WP5HWotZ3W2n8AKh2xB38A9oht/AL2mkOBAeHgEEPDtigNl+574D2PrGc5i47pNvOwLz5xVgfo+KE2wPyzgPo6sr/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjmV2KbeE1+RncILBZNva51GNZF/QLbMZu25hb8450DcKI7+50yNQMKSr+hnSKdkU3xVo5es2smZfI88tJIEMqwnQcWvRkbxy2A7g7wVvg3Q23LDT3rREAsYKAIqmzaJdVfgpd3JnvJI4M49gAy8Nxg1ZonjU3WGcuMrhv5xVEyUCxPZGNN8zAsWNQ9GhDHFkButqvDnqIRlksM2dftMWKeEQNNGGfKQJPyxfsZEy9BfdsNFOoVtL1OzHnsAOQBwy+gTWGebEIyS3oP6IFTJIrEHB2ARlHYxAeK/pMFlYvQ1PkY/l4Cz+lptN0mgWVsAORSZYaXDRt105R5MkMMDwP27JHAk/OMJI4zBpKjqOIzBHE/jmYuY8tjaPsNJM5YmrA/FJZd1vk8I9+nYdqglklGQUSn9ZwwsFeuR2a38Lsz/y1o6enA4eBH2P4pRv7QegCZ/3CFhOQ/6kYT9FwYcolH35Bdf7+FQUR+gaT+Thw+Jqc9joL7CdSJPzAyZWsB5JRfuLiaqn6u81QR+19o7/05VDU0ohZMw1FIHOQWJUNxRRnKm0dx/PsnvFcvc8bqIPVWN9khJSMHI/Mb2JONY8tANr70gPzifyl+j00CXECAGiAxeTJGOnOjX7IcID5pLpTW7IOugQtOJY9hkBilkDZjIZc1O7LOwq6SAEjb+Q7plTgBYR2AnH3Bq0nnHazDxnT0vYBm4WOOmkkKCJ4EuYVl+PwZQyBHC6Am8joBUDTljj12lF61KLIrYNGS4rFhIPMVs9A0v3X4tavQ2FEDIaHqPVqnPAsCQ7ZDVEwFbNpSC+ujd+H5Bpg6dZoGyBX+7siGShx6/UNv2mZgGAAoTlSMBCKpx1ZwHjbG3YPm/DChB/eF1prwshUddB5v4NAwCtN89IUs312YKA4IToWcwpMI7k06ISp2tHuATD1dh/sqX4EtSffBvbM9lOfCIz2huvEZZULA0KxNTHj3fqL1jlD/OipTdrBw8dJKNOcQ8J0fay0Due4jU0UDh+3Q1NUHS5axvEn38LoXwc68Y9DVr4+64iHO47X0fA7Z+YdhmZ+vAmRKRiK+pL9p2ChqO83fQpnVjZ/ii2nGv69pQRw0OBy+MCXjfbQKgLXrU603YYBADBRkmv1pWBPhogFv4eIsqGq8aBhdjRggml0/9aPXEMgnYY4vm35aGTQZKuofwes3NGyUdaBswlm5J6Cyvk4JcHKd4jN9dIxMOhgOoeF+4FhvsQ7AwJB2BO8DfGtsADzJYbaLlyZBQ/t100BgqNVkAe0AsqXnC0hKrSKcd7BxPXT2n9WWbRC1eXAg0mpNRBSa56u0TCMBL7aFBMOVQbvByxvA09PHWgBTMo7gG9uu8YleM8ORlV8ZD+VGAtAASO7/Khtew+AU4HhxM1BXEt84rGOjkYuIjO5BVxNB7xf9pZF4J+UlbDvicFMu1gK4q+S3EBsvwrcYBfJnWl/lJPqNdIhDO1JmV/8V1GkHsJ7JtLbUzBg09VNOtSMBZHNiH47RAQX9UdNFKm00/rvYKWsAnOG1GDJzcmHKVLWmrSkv6n2ME41mZMKa+TvZRzrYWNX4HgStWk7r9A+YiIFiP0bdq5qFKQoe9aXDKIsi6L2lNSUq2CZmT66XVN1QXIZlAC5eugkiN6iSw3d+PLT2aIdysn/STBYc0HdEvq4BUGJjZ/9XyMAWIBO3JK3bMB87fj8C9ikDhMqSiyiNapQ22gpinAPoKLuijnRyhrUA+syahZpNZV9mzhtav+fELJ0ycCSzlnxjRf3bEBQSorRj2QpXFMMrIDZhHf7NBDpfXigozdKy1KBeCmA96aS3dQDKc2bTpq1BHSiwz0xv3YoJm+TJQYmxEX1jdh+BCuTEZ5o9pwM0d7+gatFBPYDchMtq7WJZ1gURnqJjf2gKjOgDZa3ndF1YBtjEZ4m+sb79AzTZTNF/KSmvOEONwiMEkfz7LoiPWgcgZ6Jt1znVfEWfJssF6puu4xDrV5BT0AP5xQ+i5HkTx7zD33k6i78Y8tvQ/hGK8Acw+qZD3NatUFJ9CPOvjFg+LyM57fjYAMjSLOozZADNlhR3leTo2BERGYKR9Dgdv35fQCq+bohF4z1Cu8wWpMg9ZO14ddi+sQRwLd0lJUdfGQRyvaH9OeUpMtPhKlla5IZkFObvK5uKZLPWnJtEejM/a2b+4jME6LoW0sGwsQPQe2YSDrcc5mPm9B3OPjNnM31G3i1FgFTBdMeAMICi+bJOkJsBKNclA2ekMeWFKc7c7eknlTaNCYAzfbbp9Z+k33jjErcv0pmvmMS1iJBQf6huOqULMjJIXC+aySdZ5+me4+wbslMl4eUdLTfLahOOHtGEOYBJqUucAkgSCUzqJOxkSLc9ggN8g60houmKADthoDMTJkfCtudprZKFWA3gIhzY2zXTRRoAOQMPEvMIGhFAnkQ2hoaHom98SxMMem8FQDMGOp4hbS+u+BT4zi0pWQ2gK8qRr/UASm+YXM+w6czDadKycSI+/xCycQTJIwIl+UzZX3Lw6tuGcWS1jfVGLyGtA9DNjQnBhG0v6dZ4ZanABGrWLQHIk7izNCR0LZTXva7RfWaSxBBAqU1NXTdghX8Z64/x/hjrAJwyZQbM8Z2IY85yuuNUNlvRSZPGlte23RaAJGnZ6AJxiQU48jitjImNpIrObCWLqG+7DH4BNlriRP0o0HoASQoNXw1ks3h57RXdtLk4lKM6sOPHtw0gT66aXQMTMDDVIBD/Vl6SvO4iA0rbiIK9sOyfMGt2zEjgWQ9gYHAKrI92hdj4X+sbLQBIzjv7TiJbvzOGDDoNkB4Qs7kQisqPoSa9Skc04nib+0xiJeW1FyBq4wA+w2ZqRrFL1eogMhtSM6tguX+UTs7IAPYOfg3Rsd/tmwM5yVvSfO6dBhHrE5GZ7ZCV+xiOiX+CwedHaPId4LeSbDRXETMIGEbJOgD5ZMLaqAPYyEUQn/SaqWPn5rMzb7Xm2e8rkfJGW6bL6IDjyVoGMgZ4Q17xs7A5IR6qGgVNKDCQjzWrm5p0HZcTZ5XcUS5wnT1jli9fv4UXaC2AvCErA6sRvBY0lSfp7gNNRBZY2Nn/OzQlbRlkOZRsQFqwCOjij9xBslWEL9q7CJ+IzfEFuhNi9hz13qBVgC/SCyKjJ9NJVJL4jPTMe1kdc+eNGjzrASSJ7w9MyXgTKupiYWf+GdMxbN/QFUhOYw5c9EFlNUehe+AkasViDYCBITMx/3MoqXpYU+fS5S7Q1PkivpCTEL8tn+Zl5wfhyzvliMbXobnrKF5TRz/p2X60jqqGk2A06XrHAFRTOJRWfwzFleUodq/r1ki41KhsqFSe4EBl5/8G9h62Q2vPcfCeqZaYnGaDgUN2aOs9Db7z1fwtSatpWWRvzZJlobBlqzeCdp5Og9W2XEOQPqcvMbfoXaBfNgJZVAqDvffb6UeM4w5AzqbZc2wYjU+jpLifNtRokqF77/tollonFB5ZSOVH7+BViIpRd2uVVv9UkSGbtqi2X1jWQwGvrD9Nz8tq2HlN8yd45ktBi9lciSYbrDyTvSuM7uMhamHcAUgS11RBq/Yjk97Bzj9LP1eVJxgIIDkFG+i96jDNh+7eIh20FeygOXPmArTu/pgGHzYUZAFosgfgEOz3lJnb05lpVzY8Tc8bOv4M8xZI7XK7SwAkial6V2TUL7Hz70HPvks6AAkr23Y/A74OZ87Zm1f8KmVRXevj9Dx6kz99pqnrP/S3seMYzY+I9MByLtN9LH4B7CPCzJxWCiAr+wi6hI3oJ1m5PIjcFQCqDXaDsLVP0M09Rt+L9B28Cmk7mVPjDNmwqdRh4mfpiMVW0EKfTUopQCaTEcYlZPdUDAYpzHwbzilATPO8B4oqTtDyCZD9h8jH2q/DxjjV7O8aAFUQyba0fVDXpl8sIkxp6X5QszjvPXMG5l2nnU9OC8ZgcBSj7Dfg5e2O0f0PFLQdWdn496MUiO3pD2heAHlpURvbMGKfp4tD9HPXngsod6bffQCSxAfpXt6VGFS+VaagVBZ+hSMYhiCfaSkqP0EZVN82hEz8GoPESzQ/NbPH4eOeg46+v1Lz9Q8M0bwsNbnh/b3KwlRUTP7dCSDtijL0XAIJya/Q9RPORgJm+57nFV9FUlxis2NS4rJj93wDzQ9eHcgE+tAVhxR6V1NPxHqyuclPOQ9f54rgXaMAro+pVwDcawKgk3HxnQVQ2zgXWLCwHvKKLlIGESAIqwrLlP3IKDtW0MhNwGVrtKoPq2s9p8z/pWQMKvkkGLV0H0Yf+Qnmz4FVa1DW1EbQ8klZ8xduVwAk9ZH/DiA80hXH8IB+mvhPp82/8wDypLLRBwKDD6Is+ZJu7N5z4G2IjVcHq2U1H8I+Kng/1jyfnf8UZRARzysDI4QrE7CsE2zq6tBnyLpjCBQT0mk7z+B1tu+YCGliwmyU9Ar+vowW8DIOB9fcHQCSpP1fOzyx8RVopifAtqtNGbtuSXqIRu+s3KfoOWdweGQqZU9R+VngowuV3R7Ivp+h77xJ3URdqx22pZIvj9SVwJSMMPoVaVMnO0hZ5CuleQs0u0THN4A8iZMCLM1FU3JxzMCQrWXhQLaN8MRAd3fks5kFDp62nIUYtBKAbIDnSV2493A8Lx/TnM3OfO8AKgcvnPzTPA/qObAT7TXhHrALZZDDVWyQ3ECpHiEP9O0D4WWzch1ZujaDpg2OAg3LdHb8DwAA//8DAGoy2SUDSfluAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.wsl.ch/index_EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.wsl.ch/index_DE</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.134.200.0/22</mdui:IPHint>
+        <mdui:IPHint>193.134.206.0/24</mdui:IPHint>
+        <mdui:DomainHint>wsl.ch</mdui:DomainHint>
+        <mdui:DomainHint>slf.ch</mdui:DomainHint>
+        <mdui:DomainHint>lfi.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.360644,8.454924</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIJAPZ97OKnIcuaMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFhaS1sb2dvbi53c2wuY2gwHhcNMTQwMTI0MDc0MzM2WhcNMTcwMTIzMDc0
+MzM2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ud3NsLmNoMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw/9mnMeICEome9JwsYvR37cByiSK4bRDssG76ARD
+UjXBmxxgr+0RJFQgLtJiELwnJ41UMlY+CtorpReaf090OzqzbcKuDbZijOIi5Hic
+vfptOrRNwnsplNCpAQGzWar4yz9WnLTKrYhu24ysHZnjux3gMxLvqAl7+C21ExgA
+Fu0bp4MUv7L2wVLp3ersTkFs74GXxlv3IpjgO/gjv/rtvN/ACD97pjwZIkeLeByb
+9rqNYr8jSC15Hvq14GFYq2pBNZ+8UfK4tFtX2nhmr2uC9/5IvdGEcp77moi4BQac
+tSaHF09f+AAFe8lHxwpA96kcaWn6rMYwuMu2BpmdOQRzuQIDAQABo2cwZTBEBgNV
+HREEPTA7ghBhYWktbG9nb24ud3NsLmNohidodHRwczovL2FhaS1sb2dvbi53c2wu
+Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMSFarXK3mFRGfcZQsVzW7GkO2Fw
+MA0GCSqGSIb3DQEBBQUAA4IBAQAD3Xpnezw9EHK+4iPOarnrZ1m5DLIazLLvefGm
+TM8Ok8HCbTiJppiJtozZ1EpduYwqu+cmzHH96PL4HBJSi3yxjhipGQoUcJbXVKRd
+urS4IDybcHCGP/nQw7oWmnzmPAgt3TQjjqIZ6Bik17V4+YbrLxjVWOIQ5tDB1Rvt
+fd/yHuwao2QOyRuNXE4rPKuSlEJ0z8fXJzBEITbL5dtWvT+F8Z/dDjnIu1f2w6Mq
+wuj/MeTYd+DoM/lKiZ3CADkIsdr4bTon8wmb/adGFG45IPWjNouDPLODwB1stc0x
+QciXFnoeJldeK2oUlQAt7geKp0lMf/2Er+D6VuxBQQjmjXZz
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">wsl.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.wsl.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.wsl.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Helpdesk</GivenName>
+    <SurName>Support Contact</SurName>
+    <EmailAddress>mailto:helpdesk@wsl.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI</GivenName>
+    <SurName>WSL</SurName>
+    <EmailAddress>mailto:aai@wsl.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
new file mode 100644
index 00000000..5fd6438f
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-viewer.switch.ch/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-11-28T13:42:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Attributes Viewer</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
+        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAMFY1Mdz9NHKMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGFhaS12aWV3ZXIuc3dpdGNoLmNoMB4XDTExMDcyNTExNDkyN1oXDTE0MDcy
+NDExNDkyN1owHzEdMBsGA1UEAxMUYWFpLXZpZXdlci5zd2l0Y2guY2gwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTAMxt4JA8xURwcDSfv8orb4luix+4
+bSsn2Vap1V22UZZ/5JLm6OuCqvRHu94zdw03jsFDCfeWD1JGFm0W+vQ4f0PHe3XE
+hnOWY2+kpkXt5N699BtlJC5Usb25l2txWmKwyqNL66MwTh5qpAd+HelpH+WwzMCS
+OGLbe37dRBnORkUMAOrCAtxxXqGd1TCzFipT5GU0As4IqmMkWTx6K+lBwe8+pzZv
+UL8A/+dtrsnUSLZ/Iw5CSyIVniKAzjcru7J/JTBkINd95maSls5g/Dlbur/3Do1e
+wy0PlSEJkas+oTONIufcAv8a6+FNx0umT/U2oHd6+htIyuRFWccTMFx7AgMBAAGj
+azBpMEgGA1UdEQRBMD+CFGFhaS12aWV3ZXIuc3dpdGNoLmNohidodHRwczovL2Fh
+aS12aWV3ZXIuc3dpdGNoLmNoL3NoaWJib2xldGgwHQYDVR0OBBYEFLnVlSgmE86I
+ENpKibTOKkuooKgnMA0GCSqGSIb3DQEBBQUAA4IBAQACmRIU2iF+1qIzdSZw1gC+
+sqsXGgXWk9bkxTK07B/j5H7uVEnBZUdbuj712lRtQd1nlBBQIeCK56wohwMzCXZx
+7bEMtfcQ8pdAvX+ZhpLBmKNS7PtadUeH34rvqa8w98RyXmlUjVZjux1T5qqVHs53
+JtCwqFapEqLiYfoEVC6hAHx/ZpUU1nRH8UJH5K+3GRnzdUgZ77Z+3ImqzM9pif2l
+F+j60QJys1mYvcl0ZxvURuOEixge4yBYtB4Zi3iUqZaXrjgci2jYU3vmvwE0pnbv
+d1JnLxNKVaHsK7hbON4ohIuPa/mSkFHYOChI6vM3iO7mPo5N5H6R8DuH/v+oPV2o
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFmDCCBICgAwIBAgIUfKxmfUy8KrHcq8mHRCrVpYNJjhkwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTExMjEzMjUzNFoXDTE0MTExMjEzMjUzNFow
+gdMxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEd
+MBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xGzAZBgNVBAUTEkNILTAzNS43
+LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNV
+BAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEnMCUGA1UEAxMeYXR0cmlidXRl
+LXZpZXdlci5hYWkuc3dpdGNoLmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA5kUbUOvI58i3QBK/1mk/w+ob9ABfl3zrROcshAH2nyYp3bXB0OUTtWRD
+cD2U/0Is8QW+1mktBoKa+Rw7422hjG2EvfpwHtCKfjamBGQLAzi+1jZKdDw2GMXM
+5j7ZTBCaAh8orfTQojk6+YxQSMR6ynekwNH/Y8H8sVGsoc5ZktTEiAkFFmS1fsvR
+EKa44d9hoE7rqf5LMxc3gACi/c9yxvDreGvd8ZbWt2lq1ti14w4x3HoSAx0iyXmL
+zuRhrxchpb4PspNwSMHODRH/sbVYF6TGapxUEKeS7LrUVmWSZOzN5jdXajHqPlX6
+xsGcyN5YSkaycKg61ZEoCDtGKvw8UwIDAQABo4IByTCCAcUwdAYIKwYBBQUHAQEE
+aDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
+OAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZz
+c2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUH
+AgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwUQYD
+VR0RBEowSIIeYXR0cmlidXRlLXZpZXdlci5hYWkuc3dpdGNoLmNoghBhdi5hYWku
+c3dpdGNoLmNoghRhYWktdmlld2VyLnN3aXRjaC5jaDALBgNVHQ8EBAMCBaAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Z
+tu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFk
+aXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUhzmwLKgLTsjUgspI
+CynFmJRxteUwDQYJKoZIhvcNAQEFBQADggEBAHtc5+1yEvv4FHPvYHI7QYGOaC8H
+F8hJUoTEl0RLJU/OAXW4zJlwZYCpH3YtLpkvfpau9T67VU6/9XVH32pBR5boAXmx
+AobGZL1Abioful3Bjbe/rnlQ+70lCcpxxNZXV/XUByHV9KOUBGw4cVA1ys6hwCD0
+w0u+mWE7XbF8GQzs0WDn7Qx7T/+h+593He8Bv+YgNKO7asFXy/BpK0TJpyF4iKgJ
++TwojPuCMW8FCuygXjz1PYykSSyq7EBPv5vHFa+2IE8k8aJAu+KJxJo7cfWEydbN
+/Uxm5UrhF2xgLbva4FuhunvodQMz+eFIo35mq/wjbdzjdexBKQ43G/E1CvI=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Attributes Viewer</ServiceName>
+      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
+      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
new file mode 100644
index 00000000..b4883c9d
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-12T09:14:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-leipzig.de</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Leipzig</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Leipzig</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Uni Leipzig</mdui:Description>
+        <mdui:Description xml:lang="en">IdP University of Leipzig</mdui:Description>
+        <mdui:Logo height="37" width="233">https://www.zv.uni-leipzig.de/fileadmin/www.uni-leipzig.de/images/logo.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.uni-leipzig.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.uni-leipzig.de/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
+MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
+PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
+zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
+ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
+PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
+iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
+myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
+4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
+iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
+FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
+hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
+9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
+A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
+HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
+htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
+kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
+qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
+dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
+dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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://aai.rz.uni-leipzig.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-leipzig.de</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>aai.rz.uni-leipzig.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=aai.rz.uni-leipzig.de,OU=URZ,O=Universitaet Leipzig,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5DCCBMygAwIBAgIEEi6wvTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMTA3MDIxNTAzMTBaFw0xNjA2MzAxNTAz
+MTBaMFoxCzAJBgNVBAYTAkRFMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgTGVpcHpp
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVhYWkucnoudW5pLWxlaXB6aWcuZGUw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCh3JxzMGQsIZpSBajOsdg1
+PNiVwmvk8u0+BOBiKisnKfwq754g77HeLQN2F322UMxFX/Gd5SQBYJKvrvtFjcCD
+zK3yWmzcuC/6bjka1MVt0NRT3nzgtrRXz63/WQ5wWUZGZuSVeasyEObtI7w35VyN
+ccLHn1NXR3yLOAzaR/5JXFzi/mTZu4u/AvmSJFxaOfChhXEAVy+F7Umrbx1JnVF8
+PSFrvtzXhDkq82sgAYUhuAcdiDLxY+xYKzgEo/NCId3YQcaHm8Ej0jmJIYS7b51Y
+iXMNeluHgSMHjFJhcXmJfQIsUtqz9zGPRLSPhDoJY3ZZ77TM7cpvmWbqI7idmTJa
+myTwPY5q9N4UiGywrchC3fUyjXDdaPLuqSqAaw+WfRxnVIrtpTUiRdNKWrbkbvwL
+4XUMxJ3ZnM7AqHRIIJNLBdjqOFvTgM25lkEjuLsbwWvCp8PAiCzOzXLD393X4gtG
+iVnVVppyCxkSo5BpGeM6oCbgxyEnVVleyGRpmGt+AbsuyyqAU0o/XbFXnV8j+uo2
+FfI7UGVpwI7coC0IHZYhzL3gUZX/plAgXLQD0yvg38II4g/RAUR9IR+bq/YKurEa
+hLp8YYn7t7UBVkDAOLZJ5Bb55yV6IVClnRH1MSG9zxAzJha963b4Ldgl2iTBJxXo
+9hrcueYnTSFzy+aXTZxIPQIDAQABo4IBizCCAYcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPM3g5EU6fDFKqWM
+A3R4EgtwDebPMB8GA1UdIwQYMBaAFDaM3R6c0bqQgPinird0ak3JN9oOMH0GA1Ud
+HwR2MHQwOKA2oDSGMmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aWxlaS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmlsZWktY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAvUWGrn9rasTZ53tV7AIwNqlQt+flcJFiPq0/AGEZF9Shk1AHh+7MS
+htDa6ydnZH8wVSUbke+18ie0gTBZFZTGs242OBaS7Qw4cJIo9+wLugtPsYd1whsR
+kuXwvt8/kDEgDLFuw8zF4HtoRmB+cdSAlM3can5H8/DDGnny0Y5LupIEJsN9f6mI
+qK13ds7GZa2qOvOgPp+FxCDBxWBnZyX1SEhjy80q+vZE0LJOxJtW88oKMWEJL+nY
+dR5QRlXFOhmaxQ8kzm0Q/kFV/LAW/wALLNsH6Apvcb6w04QbN3Uw3kjywWkF2Q3b
+dJK6wmgTVaqH2u5BMKaDvRQ5oqgkgvhU
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.rz.uni-leipzig.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.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">e256</OrganizationName>
+    <OrganizationName xml:lang="en">e256</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Leipzig</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Leipzig</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://www.uni-leipzig.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://www.uni-leipzig.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Uwe</GivenName>
+    <SurName>Toenjes</SurName>
+    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Uwe</GivenName>
+    <SurName>Toenjes</SurName>
+    <EmailAddress>mailto:toenjes@rz.uni-leipzig.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu.xml
new file mode 100644
index 00000000..5ba4ba68
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.sztaki.hu.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.sztaki.hu/idp">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sztaki</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:IPHint>195.111.0.0/22</mdui:IPHint>
+        <mdui:IPHint>193.225.86.0/23</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.518209,19.055844</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="58" width="150">https://aai.sztaki.hu/logo/sztaki.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDwDCCAymgAwIBAgIBTzANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MREwDwYDVQQHEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYJKoZIhvcNAQkBFhNzeXMtYWRtaW5Ac3p0YWtpLmh1MB4XDTA5MDgyNjEwMTc1M1oXDTE5MDgyNDEwMTc1M1owgYQxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDETMBEGA1UEChMKTVRBIFNaVEFLSTENMAsGA1UECxMESVRBSzEaMBgGA1UEAxMRYWFpLnN6dGFraS5odS1pZHAxIjAgBgkqhkiG9w0BCQEWE3N5cy1hZG1pbkBzenRha2kuaHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOwYmjlZUiD3pG0R6EZuRHgBYNt5NfpjEDQkeGoGnD0o1LWse4/7Hmf8JoZDKRRkEFuZ0C1S20wxEnOsSK4lsftRpApaibVnAlFpmv04Y5FbAAt2G2cQjEy1L0z1Ks+iLXSZ1c3XDTBknRReUZweIndfB1Y35OEE2yUACiHKlzuPAgMBAAGjggEnMIIBIzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUMdY3+6/zwEDnlpoSr0DJ5cG5rm4wgcgGA1UdIwSBwDCBvYAUGR0qvyO4kXX/r2cF74rzd2gIsruhgaGkgZ4wgZsxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDERMA8GA1UEBxMIQnVkYXBlc3QxEzARBgNVBAoTCk1UQSBTWlRBS0kxDTALBgNVBAsTBElUQUsxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGCSqGSIb3DQEJARYTc3lzLWFkbWluQHN6dGFraS5odYIBADANBgkqhkiG9w0BAQQFAAOBgQAHI9LPaySa8/kmI6y+1z3xKh0xlyHgxY5zTq8QgV03wBz9rRVu9qewfB4lEp0opGxQGx9r9Gck/XXoekYImjsNXOkQ4vXztLQToWCJZQEe2c8c6xfGM+QZG4wNR4yq++DK7LcttW4ZI0A91UoeipNYFqY8K7N9kWsLp7pTGtZEWQ==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>aai.sztaki.hu-idp</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SingleLogoutServiceiFrame.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</OrganizationName>
+    <OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">MTA SZTAKI</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">MTA SZTAKI</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">https://aai.sztaki.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://aai.sztaki.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>AAI Administrator Team</SurName>
+    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>AAI Administrator Team</SurName>
+    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>AAI Administrator Team</SurName>
+    <EmailAddress>mailto:aai@sztaki.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
new file mode 100644
index 00000000..7120498b
--- /dev/null
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
+  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">
+                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">~okeanos global</mdui:DisplayName>
+        <mdui:Description xml:lang="en">~okeanos global GRNET cloud services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://okeanos-global.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://accounts.okeanos-global.grnet.gr/ui/approval_terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://accounts.okeanos-global.grnet.gr/ui/approval_terms#grterm</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://okeanos-global.grnet.gr/static/medialibrary/2013/10/dashboard_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
+                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
+                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
+                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
+                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
+                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
+                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
+                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
+                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
+                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
+                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
+                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
+                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
+                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
+                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
+                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
+                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
+                            yJEZ5Wfqywx4Bw==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>accounts.okeanos-global.grnet.gr</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEtjCCA56gAwIBAgIRAO4s6c+ETE33rnsC+Wz5hhQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA5MjQwMDAwMDBaFw0xNjA5MjMyMzU5NTlaMFExITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEsMCoGA1UEAxMjdzAuYWNjb3Vu
+                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+                            DwAwggEKAoIBAQDeVhIzHDfEKAsN7lZbAUI5kKTf254hHjcg6VSAOEaZJb6RaEHJ
+                            N8E0+t6XL/E7lCVTd+K09FWuGCJryA7Ahc7IuYdvI/wOfVDU608bMmwKz12FVyEH
+                            eO8riEFnBt7QZ8HQmdnuOo0o3KtX4+dxfjonA46nm2j/5lgpDsFi9LdqotmI/El2
+                            fkovex5Fvsuu7uEFbejqdXyo/lZ6C5yhAqdnC/h6Tfq7/8nZu55nDtTKYnWhhSkX
+                            eKTOdbwJT4Y1BjkcfCZuBV4zTkA6wwA12gz7wHuz/8eU52jkWmYbzijXwU+AidzB
+                            6BRkCEFL51fOjSis7/czhnExClBf2+Ogg4QNAgMBAAGjggGiMIIBnjAfBgNVHSME
+                            GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUziXgPt6+mYwwvgKL
+                            GoE2WB9Wr3UwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+                            FAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0w
+                            CAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+                            YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+                            AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+                            KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFAGA1UdEQRJMEeC
+                            I3cwLmFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdygiBhY2NvdW50cy5v
+                            a2Vhbm9zLWdsb2JhbC5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAqIDuYFZF
+                            SR4jPn1dUu8RXku1Ck0kzsb/p+b6D5nZtvUQxRGhUUw4TJy3onRH7qHInWBrJz0T
+                            tN18fxo8W6kIiIJS28qGurFfb3+z+vC1RyjARH07L7Z+ug+ubZeVVW4S3as6mPlx
+                            6efiRqCJz4sojxjy4xHUB1rKy+7i3fRxHivJyDbCDGKOy2VY/A3ORPGngxpZ1l3A
+                            Cxahaaq/tBTC3+tT7PmPcoEKlmwrGXn3E6b95mQ0iE1tZHb/oIekB/yGUENKMrze
+                            yjODwZKEzsFZOiN5R5mh/mDUTT3GfuYsLKlRoWg07oXaG9JcK57PnHeOtl6sjXtO
+                            yJEZ5Wfqywx4Bw==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Artifact"/>
+    <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>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="0" isDefault="true">
+      <ServiceName xml:lang="en">~okeanos global</ServiceName>
+      <ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <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="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Greek Research and Technology Network</Company>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>~okeanos support</GivenName>
+    <EmailAddress>support@okeanos.grnet.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl.xml
new file mode 100644
index 00000000..4e9a089d
--- /dev/null
+++ b/swamid-interfederations-2.0/adfs.tue.nl.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.tue.nl/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-03-20T12:22:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">Technische Universiteit Eindhoven</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eindhoven University of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Description xml:lang="en">Technische Universiteit Eindhoven</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/tue.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Eindhoven University of Technology Technische Universiteit Eindhoven TUE</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+3P2Tx32Cq1WXCYkxLaPI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/094f85b774f9b4334638677b70d5755c"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Eindhoven</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surffederatie.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
new file mode 100644
index 00000000..16ec810f
--- /dev/null
+++ b/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agata.suz.cvut.cz/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://agata.suz.cvut.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://agata.suz.cvut.cz/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Canteens of CTU in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Menzy ČVUT v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.suz.cvut.cz/en/the-facilities-administration-department-of-the-czech-technical-university-in-prague</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">https://www.suz.cvut.cz/sprava-ucelovych-zarizeni-cvut</mdui:InformationURL>
+        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>agata.suz.cvut.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=agata.suz.cvut.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIRAJSnezeeSwDm9u6PQ2mCUPswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA3MDEwMDAwMDBaFw0xNjA2MzAyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRYWdhdGEuc3V6
+LmN2dXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkNwyaiPvQ
+fx1lS9AYlyR5VAYOwy/1KBC3FhSdGLMVpYYFIvVCEK5yDqQs6D7edBnjvqoDkIkU
+cbb6LZGz0bmiSMOE5toxMb1r8XzNcjzXe4Rn8NtFbO2lSUp77eTvMt4sTdmq1Krg
+7n5XuS0SrbIcWTh4M81QazVCIpD4L/elNCgyptKWw77EbRYe6as5lJsCcujSDCHD
+gO+gOqCM3fvOLSoCZv6zDnBAS4BVnfOOB4yRZgW5koIMFVnuXkMmyrqSc9kUiWp4
+EjghtgPuVsuhf+KWHegH63HfRBA7wp6Ukz/gkkBmRRIg4ogPUkBQJpTIBmCFHune
+hMUcueegHqRfAgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUWeCB62InMSMtp9LL306vFP2jVsgwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQVMBOCEWFnYXRhLnN1ei5jdnV0LmN6
+MA0GCSqGSIb3DQEBBQUAA4IBAQCb5NX/OotQMluDW6r3mCtXGnkSHRikC75D8+ua
+ZEobB7MQHoeJg6ked7FlkatHkoqH2CZL7B66y9mhFJUFSHhRqjmudWRrJBW4SnME
+qnYLXX2q6NSmac3fH7P6BL7FyhED9+T+zfHI99A8oplvnXf4Vws/89hbzopCoI0+
+b++srMBwK/0XLocTzlTHhzCeNKflpEsP5YlNRvj4S25FhCb82Cmd+hL2OQen5000
+C0SakbhPqTeJv59bCJOjYhLfDW90dnn3HjdManRagoyE2zGCa88C7vSqwxabi7fj
+Bie8tt/8TZ/a7EDN0YLJRmmMLKKCTwebuCYsUFiMOLdqCK2+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agata.suz.cvut.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="cs">ČVUT</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CTU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.cvut.cz/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Kanovsky</md:SurName>
+    <md:EmailAddress>kanovsky@suz.cvut.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
new file mode 100644
index 00000000..980c5fd6
--- /dev/null
+++ b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
+        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
+        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
+        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
+        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
+        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
+        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+                            j/MCNlE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">agINFRA Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>riccardo.rotondo@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz.xml b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
new file mode 100644
index 00000000..ba2b4551
--- /dev/null
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aleph.svkhk.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">svkhk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Research Library in Hradec Králové</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of the Research Library in Hradec Králové</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Studijní a vědecké knihovny v Hradci Králové</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkhk.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://aleph.svkhk.cz/idp/images/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/idp/images/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aleph.svkhk.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.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">svkhk.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUC7dbtKAQedxgZUwv3VFnAGDTwQ4wDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOYWxlcGguc3ZraGsuY3owHhcNMTQwMTA2MTcwNDQ2WhcN
+MzQwMTA2MTcwNDQ2WjAZMRcwFQYDVQQDEw5hbGVwaC5zdmtoay5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALT0PjFlLk3sfYzuMd4pWVRAYdsx9Kax
+GkF2/0OpAKJQzUA2yhJw3/JtQNbLkGahSkotsU3sbPaV7s6WTu9rJoth153eoLx1
+nNxATvfJ24MbzcK4vCU2HOOnAxFF40a64kn6BR42FpJMDvaDNrYNGC7QXnt9c16r
+drlJKZ9YeSBZ58ziOioU5hgQb3lo9AoN4/M+KVtTsc98F0oX30LYa7JklmQNukuH
+EL2fiDgQTboT8/D0lFwRb7fUXV7aV5Ycm2M9+vPWGY9/+lHNUWDV7m1V5p9QHtuQ
+Mk+j8eP1dKA7RYmpv40A5QN22YzrzUTuRhKQGthOU+VENAx+weL6ybcCAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOYWxlcGguc3ZraGsuY3qGJWh0dHBzOi8vYWxlcGguc3Zr
+aGsuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB6RVoK6wbDr4JhJu4Wd4JhW
+pfTXMA0GCSqGSIb3DQEBBQUAA4IBAQBpXII7Nhv1rB40LCIMAwk5K/+J6rZn9ng4
+4pvCT6G+FSDTPA39bVUEunlChaGYHNy4sP9UOr/YvK48zAcmdu5di15q43/FbsAr
+F6jP/7uhM3z7Il0N1/NvsQ2tRdpvuVNGiWRVwQ5RHeLTJSq0Nc1UL1I/oJTOTzcd
+ypflPtnNY6u+VVjoczH+s505mASs8NIsaYPiV2PZIRnsGbzNAz2O7efJsajyCcOV
+H1UmiGoOXaYvAlNI0OdAmLiuTyYCiMPx2HHi9mJnnc6wK5LlH5KP336KQLObLvU4
+/ygOfyI2RELa14PCEnCMPPI4NNry20Pp1kuXfT6B4DB+LvcQfREJ
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.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="cs">Studijní a vědecká knihovna v Hradci Králové</OrganizationName>
+    <OrganizationName xml:lang="en">The Research Library in Hradec Králové</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Research Library in Hradec Králové</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.svkhk.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Sklenář</SurName>
+    <EmailAddress>petr.sklenar@svkhk.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu.xml b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
new file mode 100644
index 00000000..6f2d52ba
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to access and use the applications of the DECIDE project
+                        which provides neurologists and physicians with software tools for the computer-aided
+                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                        medical images.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
+                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
+                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">DECIDE Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
+                    which provides neurologists and physicians with software tools for the computer-aided
+                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                    medical images.
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">DECIDE Science Gateway provided by COMETA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">DECIDE Science Gateway erogato da COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
new file mode 100644
index 00000000..fe86e058
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">EUMEDGRID Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EUMEDGRID Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service provides information for Grid users, Application developers and
+                        Grid site administrators. It is mainly devoted to the people involved in the
+                        EUMEDGRID-Support project but many pages are of general interest
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
+                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
+                        EUMEDGRID-Support ma molte informazioni sono di interesse generale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">EUMEDGRID Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
+                    Grid site administrators. It is mainly devoted to the people involved in the
+                    EUMEDGRID-Support project but many pages are of general interes
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EUMEDGRID Science Gateway provided by COMETA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">EUMEDGRID Science Gateway erogato da COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br.xml b/swamid-interfederations-2.0/apu.uepb.edu.br.xml
new file mode 100644
index 00000000..234a6f32
--- /dev/null
+++ b/swamid-interfederations-2.0/apu.uepb.edu.br.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://apu.uepb.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">uepb.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEPB - Universidade Estadual da Paraiba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uepb.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uepb.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
+MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
+RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
+DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
+69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
+C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
+Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
+KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
+X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
+TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
+qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
+D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
+q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
+CvJy0328d1Yogr7WxVkO5sQr
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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://apu.uepb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://apu.uepb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apu.uepb.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>
+      
+MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
+MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
+RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
+DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
+MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
+69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
+C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
+Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
+KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
+X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
+TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
+qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
+D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
+q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
+CvJy0328d1Yogr7WxVkO5sQr
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.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">UEPB - Universidade Estadual da Paraiba</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uepb.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uepb.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Gerencia de Redes</SurName>
+    <EmailAddress>gerencia@uepb.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
new file mode 100644
index 00000000..2226fdb1
--- /dev/null
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
@@ -0,0 +1,136 @@
+<?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">
+  <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>
+    </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">manchester.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Manchester (Beta)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
+        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
+						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
+						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
+						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
+						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
+						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
+						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
+						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
+						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
+						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
+						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
+						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
+						0EI2geY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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://beta.shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.shib.manchester.ac.uk/shibboleth-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">manchester.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEgTCCA2mgAwIBAgIQODuhTy09Kmsw2IJOGwc+7DANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDIxOTAwMDAwMFoXDTE2MDIxOTIzNTk1OVowSDEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpiZXRhLnNoaWIu
+						bWFuY2hlc3Rlci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+						AMa+jhEPLHaYtVI2iX/NONYYshBjccXs1+aZ9ciOvFd3QFRbSr84QprqBdyai7MI
+						boYQZBaEs7bxbAiozZf14L2XAG5sOz1Ra9fJaM/8NbDnVBOou6hHAd1Wqh+/z25p
+						WYA1Sw1H9V5C9VSMtSW6C2vC79WDfyVrPL8mvKG+d5hD/PlFZerIDQVuljOs8wQ5
+						htI7/70dxBZI2ls9xBb1dfyVj/dGp6g6DgIzVcKplq0EwjrrOGwi7S5xevAnPOQl
+						8hm7oMj9TqtqaQLOzKJCtliG3tt9x9lZblSWDAzw21xdl2SXyKVE1rGIAqvTwmDt
+						EwFMHh0pFbGbaqmZFQaY4CkCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTkbYr6vMAy5gunSZ2FH1wilnPKNTAO
+						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYmV0YS5zaGli
+						Lm1hbmNoZXN0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAIQIFKVQYtqBrghB
+						6NjTsCIyyDl4NQ6+3xKPDcdBTAZGwLATb6SSd233q8hIwP6z6bibFFwrIBOLbFyY
+						x+7Q6Sy3E+NMd9jI9mREAP8JtnTZfDS9Howj8pZHfwZK2MP2CuSEkyckJfsawgMu
+						UQDWiDFsxNM47l1iZsMGDLcrHXFn9nj2owQ5QGwh1rOyoxJnDciy6Yu/JdpTURYJ
+						U+NheJHahcplg8zBqGUsrrERVQ40BjSi81Y2yPohJqje8AM5tCSD8XW5RcWoNoet
+						vWH3fKPnKXnFm+4A6glqcmRMsNebh/gX5tugbOgVt4SFmC+CFpmUQWqVisGrp8iK
+						0EI2geY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.shib.manchester.ac.uk:8443/shibboleth-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">The University of Manchester</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The University of Manchester (Beta)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IT Service Desk</GivenName>
+    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Sam</GivenName>
+    <SurName>Jones</SurName>
+    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml
new file mode 100644
index 00000000..9b3c0675
--- /dev/null
+++ b/swamid-interfederations-2.0/box-idp.nordu.net.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NORDUnet Box Service Access</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NORDUnet Box Service Access</mdui:Description>
+        <mdui:DisplayName xml:lang="en">NORDUnet Box Service Access</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NORDUnet Box Service Access</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>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</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>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">NORDUnet Box Service Access</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Box Service Access (box.com)</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="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="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NORDUNet</md:GivenName>
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
new file mode 100644
index 00000000..9da8aa00
--- /dev/null
+++ b/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://butare.ifrn.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifrn.local</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrn.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrn.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
+EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
+cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
+CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
+MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
+c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
+BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
+MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
+MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
+ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
+jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
+9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
+0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
+sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
+7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
+mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
+qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
+nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
+uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifrn.local</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
+EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
+cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
+CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
+MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
+c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
+BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
+MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
+MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
+ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
+jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
+9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
+0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
+sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
+7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
+mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
+qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
+nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
+uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
+		    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Carlos Eduardo Egito</SurName>
+    <EmailAddress>eduardo.egito@ifrn.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
new file mode 100644
index 00000000..6b1153f2
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe-gateway.ifce.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifce.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifce.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
+REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
+BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
+BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
+NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
+YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
+9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
+MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
+YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
+tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
+7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
+Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
+mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
+N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
+a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
+ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
+697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
+gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
+3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
+r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
+YyQuuTeZTwk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
+REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
+BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
+BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
+NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
+YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
+9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
+MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
+YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
+tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
+7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
+Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
+mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
+N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
+a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
+ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
+697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
+gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
+3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
+r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
+YyQuuTeZTwk=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifce.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifce.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jessyca</SurName>
+    <EmailAddress>jessyca@ifce.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe-idp.ufc.br.xml b/swamid-interfederations-2.0/cafe-idp.ufc.br.xml
new file mode 100644
index 00000000..b62100cf
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe-idp.ufc.br.xml
@@ -0,0 +1,130 @@
+<?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-idp.ufc.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">ufc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFC - Universidade Federal do Ceara</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFC - Universidade Federal do Ceara</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFC - Universidade Federal do Ceara</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
+UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
+IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
+aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
+CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
+bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
+JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
+3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
+KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
+fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
+jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
+AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
+MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
+BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
+IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
+X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
+AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
+shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
+QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
+nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
+bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
+U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
+8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
+oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
+6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
+U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
+pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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-idp.ufc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-idp.ufc.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-idp.ufc.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">ufc.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIFlTCCA32gAwIBAgIDIAACMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYDVQQGEwJC
+UjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFkZSBGZWRlcmFs
+IGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25vbG9naWEgZGEg
+SW5mb3JtYWNhbzETMBEGA1UEAxMKU1RJL1VGQyBDQTEZMBcGCSqGSIb3DQEJARYK
+aWNwQHVmYy5icjAeFw0xMjAyMTQwMDA3MjdaFw0xNTAyMTMwMDA3MjdaMIG6MQsw
+CQYDVQQGEwJCUjEOMAwGA1UECBMFQ2VhcmExJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIENlYXJhMS8wLQYDVQQLEyZTZWNyZXRhcmlhIGRlIFRlY25v
+bG9naWEgZGEgSW5mb3JtYWNhbzEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMSgw
+JgYJKoZIhvcNAQkBFhlmZWRlcmFjYW9fY2FmZUBzdGkudWZjLmJyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApeXN9BTjR7AV5uuJb2dRAKEJt/KzgRiI
+3cCUyOmrPUE04I8Sbp3wWxlVA1k6iwItp5B+2tOvfa0+4uvv0osb12bQSdPEzwj2
+KPA6BIqbvgHKFX+eUI0Elg+/XfxOug2Iw/7s/GGjYizkbe+DzuvfN/MDM0wfHorN
+fDHhbmIa6H+MD4sPqWe1bQ3SK/SX0s1k+3K9fIqapdZN4EUY4vslRpeOIqWrxWAC
+jSoEO1a0O6Y7ICx7fCl6G/WWTO0xQD7viAm62J2HGoLQDghXcVPPUnVjCkjbsKVn
+AmiObh4lMc+yMskm+xFdMBSbj/WBL/tHn2+uv0aLnQZ+zolC58vi8QIDAQABo4G1
+MIGyMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZAMAsGA1UdDwQEAwIFoDBF
+BglghkgBhvhCAQ0EOBY2Q2VyaWZpY2FkbyBnZXJhZG8gcGVsYSBBdXRvcmlkYWRl
+IENlcnRpZmljYWRvcmEgZGEgVUZDMB0GA1UdDgQWBBReOcIa7LgN9ILR8HfwOwXd
+X7YQqzAfBgNVHSMEGDAWgBQ3qefaK1KfmDaPK09j5qeA8C5kdTANBgkqhkiG9w0B
+AQUFAAOCAgEAdoQaFNlkV6XxTaRY95vhYe79oEu9pt9GWN+0x7/BHAb3wAtyjCiN
+shOgW6WuelgWTpWnJZFWPJ02/DPzjYaqxikgPIbmPOjpcnRoKr+7ZV0adecOAx0v
+QRlyped/WCV7UoPxKSWBAH525HatXsdqHY4UEAc+DnM72dljQxKuoO+FgBkIsfFb
+nY6nDjqofZpjeUaEiXx0iZZawpPPL2f3fUzQacCktIcogWT7owSs7kBLWjkxqX8H
+bBwpy0Vi7GQ+vlis7101Akkn5ByEla+CEdZNQ9mSQ6PkX2o4PBqjVHkOkphnxSq6
+U5ckksAXefMjEll0i+uyDWRcAU1RPpfUsX8XFeTPDQQUE+tBLd/xzM8lRPKKRZmt
+8PMWDvkMh+AejFsL0qhWJ/ZhdkiSFGBxna7KujkU94yQ3uswkW/zk9cOFLKMcYNj
+oXi2CET7dQR41z4rOiT/m/ahE28z7UIGtPQ6/nWSbJNlDjrMBJUUvSTYiYmRrERm
+6+dvS6XbmQE7oRwKAr4C/QzrTcqNeUjNyBdwIM1JIew9x2rP8Oz8r4JvniFzpOQJ
+U9NOxeEjsUXIzVRleY7p9PdHzI8dlw1eaUXpY6wxo1I5tlE/s7CXBluBu1XFmfjW
+pvRqAIJbiBU2SoQSshxQrIgHmPuHBnucMrgU3yjwTjboiqKD9o88NyU=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/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">UFC - Universidade Federal do Ceara</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufc.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufc.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Federacao CAFe</SurName>
+    <EmailAddress>federacao_cafe@sti.ufc.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
new file mode 100644
index 00000000..4417d1c1
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
@@ -0,0 +1,100 @@
+<?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.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IEC - Instituto Evandro Chagas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IEC - Instituto Evandro Chagas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IEC - Instituto Evandro Chagas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iec.pa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
+BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
+MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
+f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
+sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
+0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
+sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
+dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
+ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
+dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
+Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
+Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
+lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
+fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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.iec.pa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.iec.pa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.iec.pa.gov.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">iec.pa.gov.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+                MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
+BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
+MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
+f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
+sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
+0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
+sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
+dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
+ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
+dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
+Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
+Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
+lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
+fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==    
+                
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.iec.pa.gov.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">IEC - Instituto Evandro Chagas </OrganizationName>
+    <OrganizationName xml:lang="pt-br">IEC - Instituto Evandro Chagas </OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.iec.pa.gov.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Equipe de Operacao da Rede IEC</SurName>
+    <EmailAddress>rede@iec.pa.gov.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifb.edu.br.xml b/swamid-interfederations-2.0/cafe.ifb.edu.br.xml
new file mode 100644
index 00000000..2cfc3b17
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifb.edu.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifb.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">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFB -Instituto Federal de Brasilia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFB -Instituto Federal de Brasilia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifb.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifb.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIEJyYXNpbGlhMQwwCgYDVQQLEwNEVEkxJDAiBgkqhkiG9w0BCQEW
+FWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxQIQnJhc+1saWExCzAJBgNV
+BAgTAkRGMQswCQYDVQQGEwJCUjEbMBkGA1UEAxMSQ0FGZUlGQi5pZmIuZWR1LmJy
+MB4XDTE0MDMxODIwNTEwN1oXDTE3MDMxNzIwNTEwN1owgaMxIzAhBgNVBAoTGklu
+c3RpdHV0byBGZWRlcmFsIEJyYXNpbGlhMQwwCgYDVQQLEwNEVEkxJDAiBgkqhkiG
+9w0BCQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxQIQnJhc+1saWEx
+CzAJBgNVBAgTAkRGMQswCQYDVQQGEwJCUjEbMBkGA1UEAxMSQ0FGZUlGQi5pZmIu
+ZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyXg2RYKS3gs+
+KyMieIczNXtp3nZQ+OSd0rt3LY89HjNniyxDR6bbYN0Ju/2D9Ri2tRmTNvDWlUO5
+mSasgQjoikbbfltiKzW90VXoTNyx+obpxUrTv6i/t50rNJQBQv0k8KKhFxuH6iXg
+xgZDbvW02kojuloTVLcBaamKIYQspcsi2fdIydy5BGMDxcuFiRlYuTvp15a3jdwp
+N5RB7jAxCAqOFX+x+WT1iKxxyd99yrMkqULuofnJGbzI1DNSmnjdXmx2RD7I0U9k
+4lzQud1pxQCjIMGV7yzefqsuSRA963T3lvFj5qGW0xa1wJkzk1YNVtZ3/ZYau7k1
+O1MblKiNsQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBNfZ8x+8aclNvyAbwSYt7j
+ajQVFMerAiDdSCl8P1soINfc/ChUR8/av8ood1CTes8cdN+6H8nU7YchLkOPGTnj
+mP6q8mHXcwncv5hra4iEybxDBMbQcI8cQ/uenSv9qUUTIBBipAQ02SsS9aWG3Aff
+FSsqYOYJNfH63np2yq2pVgLRAvWRCwNWMLdVurVcSnIEgURCi3mglZ3YEkFaEZke
+KRt+nqGk6sUOy75TSsHJASlXYo2B+0+ZG0YinsZlvwy77IoitcTy2KZx6nPyrnjB
+WqU10N4EUzGItHRndSIIo9gGLO+PaxQi8XmvruvwB5n/q6E2hXF4H0tttiNB9Fcx
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.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.ifb.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.ifb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifb.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>
+      
+MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIEJyYXNpbGlhMQwwCgYDVQQLEwNEVEkxJDAiBgkqhkiG9w0BCQEW
+FWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxQIQnJhc+1saWExCzAJBgNV
+BAgTAkRGMQswCQYDVQQGEwJCUjEbMBkGA1UEAxMSQ0FGZUlGQi5pZmIuZWR1LmJy
+MB4XDTE0MDMxODIwNTEwN1oXDTE3MDMxNzIwNTEwN1owgaMxIzAhBgNVBAoTGklu
+c3RpdHV0byBGZWRlcmFsIEJyYXNpbGlhMQwwCgYDVQQLEwNEVEkxJDAiBgkqhkiG
+9w0BCQEWFWh1Z28uZmFyaWFAaWZiLmVkdS5icjERMA8GA1UEBxQIQnJhc+1saWEx
+CzAJBgNVBAgTAkRGMQswCQYDVQQGEwJCUjEbMBkGA1UEAxMSQ0FGZUlGQi5pZmIu
+ZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyXg2RYKS3gs+
+KyMieIczNXtp3nZQ+OSd0rt3LY89HjNniyxDR6bbYN0Ju/2D9Ri2tRmTNvDWlUO5
+mSasgQjoikbbfltiKzW90VXoTNyx+obpxUrTv6i/t50rNJQBQv0k8KKhFxuH6iXg
+xgZDbvW02kojuloTVLcBaamKIYQspcsi2fdIydy5BGMDxcuFiRlYuTvp15a3jdwp
+N5RB7jAxCAqOFX+x+WT1iKxxyd99yrMkqULuofnJGbzI1DNSmnjdXmx2RD7I0U9k
+4lzQud1pxQCjIMGV7yzefqsuSRA963T3lvFj5qGW0xa1wJkzk1YNVtZ3/ZYau7k1
+O1MblKiNsQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBNfZ8x+8aclNvyAbwSYt7j
+ajQVFMerAiDdSCl8P1soINfc/ChUR8/av8ood1CTes8cdN+6H8nU7YchLkOPGTnj
+mP6q8mHXcwncv5hra4iEybxDBMbQcI8cQ/uenSv9qUUTIBBipAQ02SsS9aWG3Aff
+FSsqYOYJNfH63np2yq2pVgLRAvWRCwNWMLdVurVcSnIEgURCi3mglZ3YEkFaEZke
+KRt+nqGk6sUOy75TSsHJASlXYo2B+0+ZG0YinsZlvwy77IoitcTy2KZx6nPyrnjB
+WqU10N4EUzGItHRndSIIo9gGLO+PaxQi8XmvruvwB5n/q6E2hXF4H0tttiNB9Fcx
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifb.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">IFB -Instituto Federal de Brasilia </OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFB -Instituto Federal de Brasilia </OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifb.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifb.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Hugo Faria</SurName>
+    <EmailAddress>hugo.faria@ifb.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
new file mode 100644
index 00000000..1bf9704a
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFES - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifes.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifes.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
+BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
+YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
+CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
+MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
+EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
+DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
+BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
+Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
+8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
+7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
+9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
+728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
+mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
+FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
+ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
+hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
+q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.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.ifes.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.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifes.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>
+      
+MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
+BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
+YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
+CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
+MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
+EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
+DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
+BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
+Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
+8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
+7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
+9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
+728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
+mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
+FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
+ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
+hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
+q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifes.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">IFES - Instituto Federal do Espirito Santo</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifes.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Ramon Ramos</SurName>
+    <EmailAddress>ramon.ramos@ifes.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br.xml
new file mode 100644
index 00000000..81d776ec
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifg.edu.br.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifg.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">ifg.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFG - Instituto Federal de Goias</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFG - Instituto Federal de Goias</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFG - Instituto Federal de Goias</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifg.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
+DmR0aUBpZmcuZWR1LmJyMQ4wDAYDVQQHEwVnb2lhczEQMA4GA1UECBMHZ29pYW5p
+YTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xMjA3
+MjYwMjU2NTJaFw0xNTA3MjYwMjU2NTJaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
+RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDRFRJMR0wGwYJKoZIhvcNAQkBFg5k
+dGlAaWZnLmVkdS5icjEOMAwGA1UEBxMFZ29pYXMxEDAOBgNVBAgTB2dvaWFuaWEx
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
+HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
+/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
+3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
+VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
+QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAHiOw84rkwHA7OjQuVDPnEvyVWxPvvHZu2hqvFiybf4s
+PlDNG330L9k+MZDZSXy2JA1dTWBqLUbDFcX9V2m32D6CP2TUttWIS+fN7H1+gc1U
+LpoPByCxDlc3yXxluN2h1I3m9aOK++ZiZVZIZP9CPXc20qyq3bdiVWXUwIVRyzQu
+FPFgsUiwvQUyE1f6fkd9aN2xClUDTY8bNdXsTZILIfUs3gMD0tM9aTrcve+SyC4m
+akqd4eyks0/vB1ulX0Mi5fGl8Hs0FpNJUK1V+gnFGPeNEiIvPVH3JXnIRu0o8ZmN
+1JHbvSUEzlJl51qNZeEEY2lxfCSVaOY8cvpe9vwFVUo=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.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.ifg.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.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifg.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>
+      
+MIIDrDCCApQCAQAwDQYJKoZIhvcNAQEFBQAwgZsxIzAhBgNVBAoTGkluc3RpdHV0
+byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
+DmR0aUBpZmcuZWR1LmJyMQ4wDAYDVQQHEwVnb2lhczEQMA4GA1UECBMHZ29pYW5p
+YTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xMjA3
+MjYwMjU2NTJaFw0xNTA3MjYwMjU2NTJaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
+RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDRFRJMR0wGwYJKoZIhvcNAQkBFg5k
+dGlAaWZnLmVkdS5icjEOMAwGA1UEBxMFZ29pYXMxEDAOBgNVBAgTB2dvaWFuaWEx
+CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
+HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
+/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
+3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
+VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
+QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAHiOw84rkwHA7OjQuVDPnEvyVWxPvvHZu2hqvFiybf4s
+PlDNG330L9k+MZDZSXy2JA1dTWBqLUbDFcX9V2m32D6CP2TUttWIS+fN7H1+gc1U
+LpoPByCxDlc3yXxluN2h1I3m9aOK++ZiZVZIZP9CPXc20qyq3bdiVWXUwIVRyzQu
+FPFgsUiwvQUyE1f6fkd9aN2xClUDTY8bNdXsTZILIfUs3gMD0tM9aTrcve+SyC4m
+akqd4eyks0/vB1ulX0Mi5fGl8Hs0FpNJUK1V+gnFGPeNEiIvPVH3JXnIRu0o8ZmN
+1JHbvSUEzlJl51qNZeEEY2lxfCSVaOY8cvpe9vwFVUo=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifg.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">IFG - Instituto Federal de Goias</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifg.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Diretoria de Tecnologia da Informacao</SurName>
+    <EmailAddress>dti@ifg.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
new file mode 100644
index 00000000..e7af68a7
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
@@ -0,0 +1,118 @@
+<?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.ifnmg.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">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifnmg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
+VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
+MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
+MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
+BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
+IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
+MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
+CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
+kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
+/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
+5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
+QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
+Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
+PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
+eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
+XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
+Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
+cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.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.ifnmg.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.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.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>
+      
+MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
+VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
+YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
+cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
+MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
+MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
+BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
+IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
+MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
+CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
+kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
+/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
+5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
+QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
+Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
+PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
+eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
+XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
+Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
+cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.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">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Christopher Mota</SurName>
+    <EmailAddress>christopher.mota@ifnmg.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
new file mode 100644
index 00000000..668ed7f3
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifpa.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.ifpa.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">IFPA - Instituto Federal do Para</mdui:DisplayName>
+        <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:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xKTAnBgNVBAoTIElGUEEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG
+9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDjAMBgNVBAcTBUJl
+bGVtMQ0wCwYDVQQIEwRQYXJhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5p
+ZnBhLmVkdS5icjAeFw0xNDAzMjYxNjM0MzdaFw0xNzAzMjUxNjM0MzdaMIGtMSkw
+JwYDVQQKEyBJRlBBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gUGFyYTEMMAoGA1UE
+CxMDRFRJMSswKQYJKoZIhvcNAQkBFhxhbmRlcnNvbi5hbG1laWRhQGlmcGEuZWR1
+LmJyMQ4wDAYDVQQHEwVCZWxlbTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZwYS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4dBI1l1+5yQt2v/hbWq28xrdxL+Uo8ze1JljVRVMsf4o+fvpo
+FaT7M533YL5SB0v5a0mfyp2lftrXpIZ9MvDBa2Uol2ILsDFOQ8e/q/gedUFhcF6n
++t7ti3vO07fgP/qOCP30cx9vPyO1+XZFXqb6sW6kq2HyBT2FNxpVO0EpRzkvH5JJ
+iTkiTeOM5cmzcj9qW5V7jsYi4lxkASsH/xoIOVSQKEZEXjbrafNb3bGorl2Zdup3
+vq5U0blTl1WGFzUqUFpkPeS6Ke4xWU6oFFCgdTgfMMAZZtD0mC5/oz9xJJARW0ZC
+ndkiXqz5grlmDF2zGznpLHmpwtDH7QaFGSl1AgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAA9zjRbgplt1EBgLIpTpZqVu5eDyqHPyvLyriqbONO4sctgNpQ9Q91sywbtB
+7yE67t4s29jLpzLNq7nSrhNSjw09GxlwVuhgrHa5efzQ6Dofxjyxu6ud+FUxbxL7
+0uERfoezVGEhjQ5pEQ7JMeTArpPKbWP8oezZaEvTaQHMTOJ7La+Zc+oxVmrUEzbW
+Oq666SstNF3cOpa3Q5NQ2/Y2RvZKhTSDyxtRIFBQZe/+x/rjEeh79+D0gAgkC2qX
+gX1Fk+YLQBtohJokJjO66PzCBfu3mkL+GUtOeGWI6Lc73kF6A0uSNn2HEcuE6GCh
+2rHJK3f8wkmU2Z7WkkhUvfS3HY0=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.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.ifpa.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.ifpa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpa.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpa.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>
+      
+MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xKTAnBgNVBAoTIElGUEEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBQYXJhMQwwCgYDVQQLEwNEVEkxKzApBgkqhkiG
+9w0BCQEWHGFuZGVyc29uLmFsbWVpZGFAaWZwYS5lZHUuYnIxDjAMBgNVBAcTBUJl
+bGVtMQ0wCwYDVQQIEwRQYXJhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5p
+ZnBhLmVkdS5icjAeFw0xNDAzMjYxNjM0MzdaFw0xNzAzMjUxNjM0MzdaMIGtMSkw
+JwYDVQQKEyBJRlBBIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8gUGFyYTEMMAoGA1UE
+CxMDRFRJMSswKQYJKoZIhvcNAQkBFhxhbmRlcnNvbi5hbG1laWRhQGlmcGEuZWR1
+LmJyMQ4wDAYDVQQHEwVCZWxlbTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIx
+GTAXBgNVBAMTEGNhZmUuaWZwYS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4dBI1l1+5yQt2v/hbWq28xrdxL+Uo8ze1JljVRVMsf4o+fvpo
+FaT7M533YL5SB0v5a0mfyp2lftrXpIZ9MvDBa2Uol2ILsDFOQ8e/q/gedUFhcF6n
++t7ti3vO07fgP/qOCP30cx9vPyO1+XZFXqb6sW6kq2HyBT2FNxpVO0EpRzkvH5JJ
+iTkiTeOM5cmzcj9qW5V7jsYi4lxkASsH/xoIOVSQKEZEXjbrafNb3bGorl2Zdup3
+vq5U0blTl1WGFzUqUFpkPeS6Ke4xWU6oFFCgdTgfMMAZZtD0mC5/oz9xJJARW0ZC
+ndkiXqz5grlmDF2zGznpLHmpwtDH7QaFGSl1AgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAA9zjRbgplt1EBgLIpTpZqVu5eDyqHPyvLyriqbONO4sctgNpQ9Q91sywbtB
+7yE67t4s29jLpzLNq7nSrhNSjw09GxlwVuhgrHa5efzQ6Dofxjyxu6ud+FUxbxL7
+0uERfoezVGEhjQ5pEQ7JMeTArpPKbWP8oezZaEvTaQHMTOJ7La+Zc+oxVmrUEzbW
+Oq666SstNF3cOpa3Q5NQ2/Y2RvZKhTSDyxtRIFBQZe/+x/rjEeh79+D0gAgkC2qX
+gX1Fk+YLQBtohJokJjO66PzCBfu3mkL+GUtOeGWI6Lc73kF6A0uSNn2HEcuE6GCh
+2rHJK3f8wkmU2Z7WkkhUvfS3HY0=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpa.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">IFPA - Instituto Federal do Para</OrganizationName>
+    <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>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Anderson Almeida</SurName>
+    <EmailAddress>anderson.almeida@ifpa.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
new file mode 100644
index 00000000..90770be7
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifro.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">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifro.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifro.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDrjCCApYCAQAwDQYJKoZIhvcNAQEFBQAwgZwxDTALBgNVBAoTBElGUk8xDTAL
+BgNVBAsTBERHVEkxKzApBgkqhkiG9w0BCQEWHHN1cG9ydGUucmVpdG9yaWFAaWZy
+by5lZHUuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQIEwhSb25kb25p
+YTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZyby5lZHUuYnIwHhcNMTMx
+MTA4MTM0MzA4WhcNMTYxMTA3MTM0MzA4WjCBnDENMAsGA1UEChMESUZSTzENMAsG
+A1UECxMEREdUSTErMCkGCSqGSIb3DQEJARYcc3Vwb3J0ZS5yZWl0b3JpYUBpZnJv
+LmVkdS5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8xETAPBgNVBAgTCFJvbmRvbmlh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJvLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrrhJeWHqx+5Uj4/0xB
+uiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5p2EPsP4XL+/AH24s
+86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNpYgLlocluN+xyYYFg
+i4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r1hcz9coOSmsE/fZX
+7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fsEYYYOnMSKnKB2Ss9
+Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pjv/pqK00CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAhG3JeWoW43jEDnu3BjF5nZxuZ/t90CmfVhtctPJV
+8XB2qO9AoR3yRo30AN5StpewSRa5KpTwA3Q2Dw9hxNE2NDLbdGAE46ANAuAHO+33
+fZQHO7BPBthN/qQUUDUIVE1mKkzMsz1TRtv1Hdfs/q4F+pvZ/SHsDrmJfC8rPP8p
+vShxlQ9xWkHgmK1NNs/UL5BpD762lZt2R1o9vWSTKg9Wf2qh/r8H1F0KVhCtntcf
+yVWf3vRqeVFcJSl/2xCvqsUzyi4YPPe0H6bMLiqssrH4IjIIHR+9Kw6SAyxivfgD
+ncPF1Y4GUuWaZiPI9hNVkl/z6qfyYIs0yqq4ZE6Dc2TeeA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.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.ifro.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.ifro.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifro.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifro.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>
+      
+MIIDrjCCApYCAQAwDQYJKoZIhvcNAQEFBQAwgZwxDTALBgNVBAoTBElGUk8xDTAL
+BgNVBAsTBERHVEkxKzApBgkqhkiG9w0BCQEWHHN1cG9ydGUucmVpdG9yaWFAaWZy
+by5lZHUuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQIEwhSb25kb25p
+YTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZyby5lZHUuYnIwHhcNMTMx
+MTA4MTM0MzA4WhcNMTYxMTA3MTM0MzA4WjCBnDENMAsGA1UEChMESUZSTzENMAsG
+A1UECxMEREdUSTErMCkGCSqGSIb3DQEJARYcc3Vwb3J0ZS5yZWl0b3JpYUBpZnJv
+LmVkdS5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8xETAPBgNVBAgTCFJvbmRvbmlh
+MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJvLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrrhJeWHqx+5Uj4/0xB
+uiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5p2EPsP4XL+/AH24s
+86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNpYgLlocluN+xyYYFg
+i4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r1hcz9coOSmsE/fZX
+7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fsEYYYOnMSKnKB2Ss9
+Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pjv/pqK00CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAhG3JeWoW43jEDnu3BjF5nZxuZ/t90CmfVhtctPJV
+8XB2qO9AoR3yRo30AN5StpewSRa5KpTwA3Q2Dw9hxNE2NDLbdGAE46ANAuAHO+33
+fZQHO7BPBthN/qQUUDUIVE1mKkzMsz1TRtv1Hdfs/q4F+pvZ/SHsDrmJfC8rPP8p
+vShxlQ9xWkHgmK1NNs/UL5BpD762lZt2R1o9vWSTKg9Wf2qh/r8H1F0KVhCtntcf
+yVWf3vRqeVFcJSl/2xCvqsUzyi4YPPe0H6bMLiqssrH4IjIIHR+9Kw6SAyxivfgD
+ncPF1Y4GUuWaZiPI9hNVkl/z6qfyYIs0yqq4ZE6Dc2TeeA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifro.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">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifro.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Joilson Dantas</SurName>
+    <EmailAddress>suporte.reitoria@ifro.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
new file mode 100644
index 00000000..10425468
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifrs.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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifrs.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifrs.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
+BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
+A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
+dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
+MDMyODIwMDE0NFoXDTE3MDMyNzIwMDE0NFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
+BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
+A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
+dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
+HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
+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
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.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.ifrs.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.ifrs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifrs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifrs.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>
+      
+MIIDsDCCApgCAQAwDQYJKoZIhvcNAQEFBQAwgZ0xDTALBgNVBAoTBElGUlMxDDAK
+BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
+A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
+dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMB4XDTE0
+MDMyODIwMDE0NFoXDTE3MDMyNzIwMDE0NFowgZ0xDTALBgNVBAoTBElGUlMxDDAK
+BgNVBAsTA0RUSTEfMB0GCSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEZMBcG
+A1UEBxQQQmVudG8gR29uw6dhbHZlczEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBT
+dWwxCzAJBgNVBAYTAkJSMRkwFwYDVQQDExBjYWZlLmlmcnMuZWR1LmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsXUlkSu36bt4LJdQ5za7kB40dJlD
+HAV+9CCRoUmQnFvCbu2xKdnY5Ou518/dn0sKLNRFJSj2xGpUV2Z3R7dMvOhyOSqb
+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
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifrs.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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifrs.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifrs.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Suporte CAFe IFRS</SurName>
+    <EmailAddress>cafe@ifrs.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.on.br.xml b/swamid-interfederations-2.0/cafe.on.br.xml
new file mode 100644
index 00000000..39978e74
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.on.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.on.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">on.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ON - Observatorio Nacional</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ON - Observatorio Nacional</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ON - Observatorio Nacional</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ON - Observatorio Nacional</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.on.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.on.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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.on.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.on.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.on.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.on.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">on.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
+	
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.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">ON - Observatorio Nacional</OrganizationName>
+    <OrganizationName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ON - Observatorio Nacional</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">ON - Observatorio Nacional</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.on.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.on.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>luisriera</SurName>
+    <EmailAddress>luisriera@on.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.pucminas.br.xml b/swamid-interfederations-2.0/cafe.pucminas.br.xml
new file mode 100644
index 00000000..61e3cd17
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.pucminas.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.pucminas.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">pucminas.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pucminas.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.pucminas.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFBvbnRpZmlj
+aWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UE
+CxMDQ1BEMR4wHAYJKoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcT
+DkJlbG8gSG9yaXpvbnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYT
+AkJSMRkwFwYDVQQDExBjYWZlLnB1Y21pbmFzLmJyMB4XDTEyMDIxMDE5MTMzM1oX
+DTE1MDIwOTE5MTMzM1owgcExOTA3BgNVBAoTMFBvbnRpZmljaWEgVW5pdmVyc2lk
+YWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UECxMDQ1BEMR4wHAYJ
+KoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcTDkJlbG8gSG9yaXpv
+bnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBjYWZlLnB1Y21pbmFzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAu8xto797YLkjEJQO97dSTCbcXYuV4ojfqizN+OHnEXZ3RPeuCXRXQWWvEvnz
+OAiN7sWwzvg1/doaFU3kkdV1iECLKGS+9PkaTkk+q0of8F613bvZR5wugJCU6NeF
+7PK2Bri7u0Jg8HXCTrY8ZaVRy5IYr9vbDdK3JVoDVjYGtKCUcfqiydqyo0Zdl4++
+tbc48bYX9HpZACRzBdu7puG8mC7BtgSo34NJVb9fAEJPHZ6m8ytD1y2+gNcT3HdK
+Ux8t3DGVF6rJ/YenaeodlHUEF/Hxe9SlyrFi5aqX+rp7qUQ1F2EYV64jueu7rCCj
+vpIulLXvyUILLQlPGFYSkuYCzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAcpMOJ
+9UvfI1qAadm8Dy4HvKLLBOLnVITVZw3gL8zhBJqeJkCH4C6Hp1qJp8SkX7Sx7J8L
+FM92GIwZFrjHxHij8XlyYBl/yLI+Zphu70i6C1IfY4RemAV0uHApderKN0SLva0B
+3vvA13+5eix9tXI5KNn/9GJQNB4ia/J+GwnUPi8QvlhCKAxmqOLqJwyZjaUF+6gh
+OpSYuwO0tnawCMhsqxWvp/MXPBlqpUmdW5OwRhKrH8B7PlFNppIGLDywLT4VBP9o
+9T1FO66JPad97BZyZTuhrTb847mIRSH//iqcCYU98z1r/WXaGOsIZ13w8WCGf2sI
++s1WyKG/b3PVUZBm
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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.pucminas.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucminas.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucminas.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">pucminas.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFBvbnRpZmlj
+aWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UE
+CxMDQ1BEMR4wHAYJKoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcT
+DkJlbG8gSG9yaXpvbnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYT
+AkJSMRkwFwYDVQQDExBjYWZlLnB1Y21pbmFzLmJyMB4XDTEyMDIxMDE5MTMzM1oX
+DTE1MDIwOTE5MTMzM1owgcExOTA3BgNVBAoTMFBvbnRpZmljaWEgVW5pdmVyc2lk
+YWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UECxMDQ1BEMR4wHAYJ
+KoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcTDkJlbG8gSG9yaXpv
+bnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRkwFwYDVQQD
+ExBjYWZlLnB1Y21pbmFzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAu8xto797YLkjEJQO97dSTCbcXYuV4ojfqizN+OHnEXZ3RPeuCXRXQWWvEvnz
+OAiN7sWwzvg1/doaFU3kkdV1iECLKGS+9PkaTkk+q0of8F613bvZR5wugJCU6NeF
+7PK2Bri7u0Jg8HXCTrY8ZaVRy5IYr9vbDdK3JVoDVjYGtKCUcfqiydqyo0Zdl4++
+tbc48bYX9HpZACRzBdu7puG8mC7BtgSo34NJVb9fAEJPHZ6m8ytD1y2+gNcT3HdK
+Ux8t3DGVF6rJ/YenaeodlHUEF/Hxe9SlyrFi5aqX+rp7qUQ1F2EYV64jueu7rCCj
+vpIulLXvyUILLQlPGFYSkuYCzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAcpMOJ
+9UvfI1qAadm8Dy4HvKLLBOLnVITVZw3gL8zhBJqeJkCH4C6Hp1qJp8SkX7Sx7J8L
+FM92GIwZFrjHxHij8XlyYBl/yLI+Zphu70i6C1IfY4RemAV0uHApderKN0SLva0B
+3vvA13+5eix9tXI5KNn/9GJQNB4ia/J+GwnUPi8QvlhCKAxmqOLqJwyZjaUF+6gh
+OpSYuwO0tnawCMhsqxWvp/MXPBlqpUmdW5OwRhKrH8B7PlFNppIGLDywLT4VBP9o
+9T1FO66JPad97BZyZTuhrTb847mIRSH//iqcCYU98z1r/WXaGOsIZ13w8WCGf2sI
++s1WyKG/b3PVUZBm
+
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.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">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
+    <OrganizationName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.pucminas.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.pucminas.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jose Teixeira Horta Junior</SurName>
+    <EmailAddress>noc@pucminas.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br.xml b/swamid-interfederations-2.0/cafe.sti.uff.br.xml
new file mode 100644
index 00000000..1acc37e4
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.sti.uff.br.xml
@@ -0,0 +1,108 @@
+<?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.sti.uff.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">uff.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFF - Universidade Federal Fluminense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFF - Universidade Federal Fluminense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFF - Universidade Federal Fluminense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uff.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uff.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
+ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
+UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
+MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
+bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
+aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
+XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
+tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
+4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
+yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
+agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
+l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
+wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
+qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
+Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
+KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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.sti.uff.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.sti.uff.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.sti.uff.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">uff.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDfDCCAmQCAQAwDQYJKoZIhvcNAQEFBQAwgYMxLjAsBgNVBAoTJVVGRiAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIEZsdW1pbmVuc2UxNTAzBgNVBAsTLFN1cGVyaW50
+ZW5kZW5jaWEgZGUgdGVjbm9sb2dpYSBkYSBpbmZvcm1hY2FvMQswCQYDVQQGEwJC
+UjENMAsGA1UEAxMEY2FmZTAeFw0xMjA1MzAxOTAwMzJaFw0xNTA1MzAxOTAwMzJa
+MIGDMS4wLAYDVQQKEyVVRkYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBGbHVtaW5l
+bnNlMTUwMwYDVQQLEyxTdXBlcmludGVuZGVuY2lhIGRlIHRlY25vbG9naWEgZGEg
+aW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXvhof7zm8y1QIVmLEpVVqC080Hx0Ow5nL
+XJ+gG23l2hBtMn3jSwR9lqpXtmx5lTLDOSLnLBdvV7E9ZUhFx9ybgxerRb0Brj45
+tLj4ycHbisfMA5MH2CoPa+2vnTRptHuQqaiP8N6WKcZnfJCay9M4sWfQ71Mf52xW
+4l4XscaQaGqZfvs8ZIGSKLb6U7VlUFqno1Npy7wfsYQr1yLlCOXjFdhoMKrxJezQ
+yzSmxLMb77CnLLI9X1arao2YsZXHFd36FbBDAKJ4thzc+4T2N4ORYl7xrbkC+PBO
+agiiHJhyI7DY/7ea43g+jOfpMzegVXDxybjWNOK5AmxTLGMUMDJPAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAGdHVzV4ZXlOL3dxQOoE001RPT4o15E2I4yOmU7819wG
+l4knZ6JQGYNU3uXfoGyaBB8465GH/9k8xJNn2lZyTTy2+R3nDmzFlPFkYvbs59Sl
+wHibg8abfHxRZx+eK551Ivw0Jnr5j7x1LHVDLAfzvuNPIBNpAhOIsaDoaitF49/x
+qIVZUFdkyoVjbeop384xKzfA3hFv4D5YS068QWCTsKrFXtcMCEBkL/dW0ywTlQK5
+Z/ihA7LfMSqo2t4kV+EBk1/AWTefxu107RBwojV9NHfgIVV3oVjgX/o0Le5wDKef
+KKWuTj9blE41waKTWtJSzqXi4LjSHeH+VhSn9b+8Llg=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.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">UFF - Universidade Federal Fluminense</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uff.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uff.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Uenes Vilaca</SurName>
+    <EmailAddress>uenesvilaca@id.uff.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesb.br.xml b/swamid-interfederations-2.0/cafe.uesb.br.xml
new file mode 100644
index 00000000..5e9c8c17
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uesb.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.uesb.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">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uesb.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uesb.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
+BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
+YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
+MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
+MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
+SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
+VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
+NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
+UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
+thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
+jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
+QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
+4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
+J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
+7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
+W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
+f+RldW1MxS+H81kufj7Rum74V4I=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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.uesb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesb.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesb.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesb.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>
+      
+MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVFU0IxDzAN
+BgNVBAsTBlVJTkZPUjEjMCEGCSqGSIb3DQEJARYUbGVvbmFyZG9AdWVzYi5lZHUu
+YnIxHTAbBgNVBAcTFFZpdG9yaWEgZGEgQ29ucXVpc3RhMQswCQYDVQQIEwJCQTEL
+MAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYi5icjAeFw0xMzA5MjAxODIz
+MjFaFw0xNjA5MTkxODIzMjFaMIGVMQ0wCwYDVQQKEwRVRVNCMQ8wDQYDVQQLEwZV
+SU5GT1IxIzAhBgkqhkiG9w0BCQEWFGxlb25hcmRvQHVlc2IuZWR1LmJyMR0wGwYD
+VQQHExRWaXRvcmlhIGRhIENvbnF1aXN0YTELMAkGA1UECBMCQkExCzAJBgNVBAYT
+AkJSMRUwEwYDVQQDEwxjYWZlLnVlc2IuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDX5Qd680PTIaF0ZaDfpTfPIdAIp+ydojMhCd34S3idsFGwSKiJ
+NnfOn65iPMJFynxfQuqoo9wWnPAcS22fudOTuqdwf6NFl3sUM6fXh1UmQn2pyHxe
+UrJCwViQDV6ZplF0Uw3ABnYew3gZfUk/34NR8kkB2NdBs6jp7PD+nWn9fPLNd23p
+thdpumkzbkkzRM9SweDmFbbCwJcrn0JR2H1xtUlqT/Aq9Vb8BT3JD44mZypxKU4d
+jI2/Kr9ZqaidQTcOqloiBoT1Az/fKmd1xXDDH8VFJvCGOSaXyWdEPR5kazOTLYyL
+QAq5KdWcpqU23keAklg0tw41kt1Wl1E+rb9fAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+ggEBAE0BAVExopeUKLY/yXZhQ+rw6uYi+JY64Y3w2qp3o4TKqgN9j5ziZge76fWL
+4zMh7PO1TsZLnlWPcP4oP1OQNc4EiiiNGgLT4DfNU3NtpFFhVCKU5v3JUcw/ZHGj
+J4diZ6Rb6Q2TCcBJV02Gz7p6U6nhXE0blVlyqWuZ4GZWg2PSTHgaG2JzHUHC+wzf
+7OaEuX3loT+wlm2Jq2ebDBlm+Yoth1pwE+puOluSk23P6aa71SkQjxb4pEv9sx8A
+W8Xj75F/MRL9CKazIOsUVwMSJnhDgZCDc/XxD29lBYLycFS5AJiCngmO+nYI61bv
+f+RldW1MxS+H81kufj7Rum74V4I=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.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">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uesb.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uesb.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Leonardo</SurName>
+    <EmailAddress>leonardo@uesb.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.uesc.br.xml b/swamid-interfederations-2.0/cafe.uesc.br.xml
new file mode 100644
index 00000000..e535a7c0
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uesc.br.xml
@@ -0,0 +1,104 @@
+<?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.uesc.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">uesc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uesc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uesc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
+bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
+cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
+vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
+CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
+3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
+FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
+QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
+570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
+tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
+rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
+nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
+rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
+RHc=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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.uesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesc.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesc.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesc.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">uesc.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
+bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
+cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
+cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
+LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
+vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
+CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
+3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
+FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
+QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
+F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
+570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
+tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
+rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
+nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
+rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
+RHc=                
+		
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.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">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uesc.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uesc.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>UDO/COI</SurName>
+    <EmailAddress>coi@uesc.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br.xml b/swamid-interfederations-2.0/cafe.unicentro.br.xml
new file mode 100644
index 00000000..0e3bcb80
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unicentro.br.xml
@@ -0,0 +1,118 @@
+<?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.unicentro.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">unicentro.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unicentro.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unicentro.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
+YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
+aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
+MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
+AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
+Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
+aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
+CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
+YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
+R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
+AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
+RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
+UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
+Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
+DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
+MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
+7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
+vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
+9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
+H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
+rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
+uIoHx7ZhxQYffJyfRtc=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.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">unicentro.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
+TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
+YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
+aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
+MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
+AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
+Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
+aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
+CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
+YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
+R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
+AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
+RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
+UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
+Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
+DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
+MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
+7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
+vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
+9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
+H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
+rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
+uIoHx7ZhxQYffJyfRtc=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.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">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unicentro.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Mauricio Adriano Teixeira</SurName>
+    <EmailAddress>madriano@unicentro.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifap.br.xml b/swamid-interfederations-2.0/cafe.unifap.br.xml
new file mode 100644
index 00000000..75eb65ad
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unifap.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.unifap.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">unifap.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifap.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifap.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
+IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
+Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
+CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
+NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
+c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
+YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
+YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
+AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
+OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
+di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
+G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
++HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
+rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
+l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
+DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
+kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
+NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
+AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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.unifap.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifap.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifap.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifap.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">unifap.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxLzAtBgNVBAoTJlVOSUZBUCAt
+IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMSwwKgYDVQQLEyNESU5GTyAt
+IERlcGFydGFtZW50byBkZSBJbmZvcm1hdGljYTEeMBwGCSqGSIb3DQEJARYPZGlu
+Zm9AdW5pZmFwLmJyMQ8wDQYDVQQHEwZNYWNhcGExDjAMBgNVBAgTBUFtYXBhMQsw
+CQYDVQQGEwJCUjEXMBUGA1UEAxMOY2FmZS51bmlmYXAuYnIwHhcNMTIwNDE3MjAw
+NDI2WhcNMTUwNDE3MjAwNDI2WjCBxjEvMC0GA1UEChMmVU5JRkFQIC0gVW5pdmVy
+c2lkYWRlIEZlZGVyYWwgZG8gQW1hcGExLDAqBgNVBAsTI0RJTkZPIC0gRGVwYXJ0
+YW1lbnRvIGRlIEluZm9ybWF0aWNhMR4wHAYJKoZIhvcNAQkBFg9kaW5mb0B1bmlm
+YXAuYnIxDzANBgNVBAcTBk1hY2FwYTEOMAwGA1UECBMFQW1hcGExCzAJBgNVBAYT
+AkJSMRcwFQYDVQQDEw5jYWZlLnVuaWZhcC5icjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALnDpFayIMY6LGSN8rr9/GpzUSfmzFcVRt1KF6NqMOIL4HFP
+OdaLWcWOsKNaUQBbJBiOPD4TDc/1ihU6X53UbtX7MCLJoizR7vk7NQqlhxwfuoCE
+di7Vaq2SRjTgX5oLV+ObOxjTqySJyZeF/9yj4w0/MzE1igT9Q/5N+E9dDbBza32m
+G3NcjSyPLH2/yNnq+xgROnT9plGKE0yWekscu0xvl4HVh6hC0QZmzHfHDsQnOPs2
++HoWK+NDK+Q13dPyTnRQ2dUpyXUdl3NjkFknkGtJkEhNk8te4gHfkdLZ/EMSYQt3
+rAm4Cv73Cx8ISOXScuaBUwsfc9Rvstd4p/7AF1ECAwEAATANBgkqhkiG9w0BAQUF
+AAOCAQEATSZBo/wzBEE/vxbHhBDDXRkXy6DjnOgOhc5u4cbon7HHJsgxOftZyA4H
+l7XR4R42245J6iV9BHcmCWMQaCNqjRW2LgANxpI1uKq8kDRwambPoCzhic66Jjnx
+DOcc/tR4Lop5El1G2a1lluD6Ogvk/ri7GUPQq/tBnNx6L9zTaCKB4Xkm07v4FHP+
+kQsvZVaeSRCj6TFU4UndfZx3G0HveTwTjkdEJb4u/VK1uHUgUScVz1oODMv0mCDF
+NUWidpyQsguPTdgzSCi4ztO1chZiTGRrY8BxRhBGsfkMirRVfhgdYLg0g89SP3ja
+AWH4N7Emw+Xy4wjbo3OMjdWiW0S0GQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.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">UNIFAP - Universidade Federal do Amapa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIFAP - Universidade Federal do Amapa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unifap.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unifap.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Samir Patrice</SurName>
+    <EmailAddress>samir@unifap.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unifran.br.xml b/swamid-interfederations-2.0/cafe.unifran.br.xml
new file mode 100644
index 00000000..0fa667ae
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unifran.br.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.unifran.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifran.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFRAN - Universidade de Franca</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifran.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifran.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
+WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
+rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
+YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
+Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
+l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
+IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
+QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
+J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
+wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
+yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
+knPC7Pz8oNYCCTafRaBMIA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifran.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
+BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
+WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
+BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
+rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
+YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
+Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
+l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
+IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
+QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
+J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
+wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
+yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
+knPC7Pz8oNYCCTafRaBMIA==
+                
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UNIFRAN - Universidade de Franca</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unifran.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unifran.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Gustavo Carrijo</SurName>
+    <EmailAddress>gustavo@unifran.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.unisc.br.xml b/swamid-interfederations-2.0/cafe.unisc.br.xml
new file mode 100644
index 00000000..628584ed
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.unisc.br.xml
@@ -0,0 +1,100 @@
+<?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.unisc.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">unisc.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unisc.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unisc.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEU2luZjELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTMwMjA2MTc1MzQ1WhcNMTYwMjA2
+MTc1MzQ1WjArMQ0wCwYDVQQLEwRTaW5mMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxA4rJA1Us3xte9
+CXYcYfkxH/kmOsE1j9N9BqccuWV8wSVuMkQ8V8JDSAm+MyvXTsu6cwhoGeWZtu/D
+wFzvSwX8vaXXsSFFKx+WB6QtmOqWX2rEcn6Z6nGNE41vbKYH8xm71ge47NbTLklJ
+Ml6JnR8qXajr4ewKR4mcsZ0mxa3xii7aLz5MeeE0TQT4N9YX8okE8FADNTCh3bnC
+7eEcjYhgbP71VDZRJFuHHiImn+vBE2dfsLF8sRWbM8hhUkUfZEu3z5rDctjH6TXf
+dkWD2DU1kRSpd6ZxbqoJsBrYTGRlLN83CkNs/pMyP3yQ2CQ5/8HhH5Mh7qgRuPA2
+HnWye90CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsuqKAz0R93jVSFBhXOkD5EJJ
+knViFHZlqc1ih8WAG1vj7IJMN8TonsmdyMdYxvfDz6bOQdBBZydwu01J4hDh7NU9
+ElT1CBEIojATIRaGry2y+TWr761yDo0ksla1TlOSuse31u9FCEJy7UmdEoslspVp
+ufJBdeOZESeHVkXitYAWCbDB1iKDgyllOob9w+B/2f3MSrz4wkEPKWuLRpFD+5IX
+XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
+8KlYPGgRz7bqidsVO94mihOF4AtONQ9oOydh3lfdZHKFiRkSSInkr5IH46Alcw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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.unisc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unisc.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unisc.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unisc.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">unisc.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEU2luZjELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTMwMjA2MTc1MzQ1WhcNMTYwMjA2
+MTc1MzQ1WjArMQ0wCwYDVQQLEwRTaW5mMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxA4rJA1Us3xte9
+CXYcYfkxH/kmOsE1j9N9BqccuWV8wSVuMkQ8V8JDSAm+MyvXTsu6cwhoGeWZtu/D
+wFzvSwX8vaXXsSFFKx+WB6QtmOqWX2rEcn6Z6nGNE41vbKYH8xm71ge47NbTLklJ
+Ml6JnR8qXajr4ewKR4mcsZ0mxa3xii7aLz5MeeE0TQT4N9YX8okE8FADNTCh3bnC
+7eEcjYhgbP71VDZRJFuHHiImn+vBE2dfsLF8sRWbM8hhUkUfZEu3z5rDctjH6TXf
+dkWD2DU1kRSpd6ZxbqoJsBrYTGRlLN83CkNs/pMyP3yQ2CQ5/8HhH5Mh7qgRuPA2
+HnWye90CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsuqKAz0R93jVSFBhXOkD5EJJ
+knViFHZlqc1ih8WAG1vj7IJMN8TonsmdyMdYxvfDz6bOQdBBZydwu01J4hDh7NU9
+ElT1CBEIojATIRaGry2y+TWr761yDo0ksla1TlOSuse31u9FCEJy7UmdEoslspVp
+ufJBdeOZESeHVkXitYAWCbDB1iKDgyllOob9w+B/2f3MSrz4wkEPKWuLRpFD+5IX
+XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
+8KlYPGgRz7bqidsVO94mihOF4AtONQ9oOydh3lfdZHKFiRkSSInkr5IH46Alcw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.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">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unisc.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unisc.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Cristiano Maynart</SurName>
+    <EmailAddress>rede@unisc.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.upf.br.xml b/swamid-interfederations-2.0/cafe.upf.br.xml
new file mode 100644
index 00000000..5717c51b
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.upf.br.xml
@@ -0,0 +1,105 @@
+<?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.upf.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">upf.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UPF - Universidade de Passo Fundo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UPF - Universidade de Passo Fundo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UPF - Universidade de Passo Fundo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.upf.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.upf.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
+MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
+tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
+YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
+OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
+wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
+fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
+9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
+RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
+hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
+dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
+Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
+CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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.upf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.upf.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.upf.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.upf.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">upf.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDGDCCAgCgAwIBAgIVAKX43u2xOk6GZiZYCBjCZkKXx2/9MA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2NhZmUudXBmLmJyMB4XDTEyMDcxODEzMzMwMFoXDTMy
+MDcxODEzMzMwMFowFjEUMBIGA1UEAxMLY2FmZS51cGYuYnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDQ4M1p+I5ah6Aw+O5/z9Be++lnk9Vs/F1rXbKj
+tP4ZLt+1ubEXIstFvgYbaQegfjGCmbSTLjeAhoKqQa+9oqHztvJCyi8tAAxm+DkR
+YUVjK7jdg+WhLSIXXjUw8kLQ7/0j9WoR5kANYpb0zgLX5txa6ag0yuiy3SZJdem5
+OxWcRMIgM9IT93D0Vtn4KOy33LuT1nJnlfXRe0e/6Uk3io8eX/sU1bFbYGSIoaBC
+wavXQpYI6doyMwp6jQ0ZTHMgPveJ9RgJVI1UjxPNarlfpkD3tbBoMW6jKzysuNza
+fdE/zhufAdpf1dEJLvW6NqFQhV/IntZ9uikpaZb0qYfccb+FAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2NhZmUudXBmLmJyhiJodHRwczovL2NhZmUudXBmLmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQzZ13hyDuXco93Ne8aOzsxQ7pkVDANBgkqhkiG
+9w0BAQUFAAOCAQEAxN0o+TiTOnQ9DyT3sLjL7t08L2DXXzZS808wUPm9gxAxaKBy
+RP6v52aY5JQl+5KDp4kcYWcJ2HbmY93pdJr/ySf38ZnfDhE8/VtxTPN8i8flLpo6
+hAXpIVHrpchg/6A6wG94q2hoJHJlkjdMAUaqRluRVqUf3LCh9z0L2JYggLMO8t4i
+dZva6wWLqVLrj290MtPM6VyBwky4PyopG92JhFkovN6fO+N0XBOXO95k7vRhXHMq
+Q7lzc5HBe7iHhhH8bMVnNU4rnC5y/mAtB8RlGKu9xkgHFzxpk+Rf8ZvvI6hdpmCD
+CiIzIL92AYqWu+1Ec6sT4NbrfVhJlpfh0jshog==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.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">UPF - Universidade de Passo Fundo</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.upf.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.upf.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>GTI/RNP</SurName>
+    <EmailAddress>servnac@rnp.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
new file mode 100644
index 00000000..9235d654
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
@@ -0,0 +1,116 @@
+<?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.uscs.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">uscs.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uscs.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uscs.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.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.uscs.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.uscs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uscs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uscs.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">uscs.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+					
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uscs.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">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uscs.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uscs.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Eduardo dos Santos</SurName>
+    <EmailAddress>eduardo@uscs.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br.xml b/swamid-interfederations-2.0/cafe01.unicamp.br.xml
new file mode 100644
index 00000000..762999c8
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe01.unicamp.br.xml
@@ -0,0 +1,107 @@
+<?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://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unicamp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unicamp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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://cafe01.unicamp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe01.unicamp.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe01.unicamp.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">unicamp.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.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">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNICAMP - UNIVERSIDADE ESTADUAL DE CAMPINAS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unicamp.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Sandra Regina de Souza</SurName>
+    <EmailAddress>sandra@ccuec.unicamp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br.xml b/swamid-interfederations-2.0/cafe1.ufes.br.xml
new file mode 100644
index 00000000..39fcf0b3
--- /dev/null
+++ b/swamid-interfederations-2.0/cafe1.ufes.br.xml
@@ -0,0 +1,116 @@
+<?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://cafe1.ufes.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">ufes.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFES - Universidade Federal do Espirito Santo</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufes.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufes.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
+TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
+9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
+aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
+AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
+MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
+YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
+IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
+ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
+bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
+B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
+8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
+y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
+fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
+yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
+Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
+cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
+65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
+B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
+bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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://cafe1.ufes.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe1.ufes.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe1.ufes.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">ufes.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
+TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
+9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
+aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
+AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
+MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
+YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
+IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
+ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
+bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
+B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
+8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
+y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
+fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
+yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
+Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
+cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
+65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
+B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
+bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.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">UFES - Universidade Federal do Espirito Santo</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufes.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufes.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Renan Manola</SurName>
+    <EmailAddress>renan.manola@ufes.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafernp.insa.gov.br.xml b/swamid-interfederations-2.0/cafernp.insa.gov.br.xml
new file mode 100644
index 00000000..d7c242e2
--- /dev/null
+++ b/swamid-interfederations-2.0/cafernp.insa.gov.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:DisplayName>
+        <mdui:Description xml:lang="en">INSA - Instituto Nacional do Semiarido</mdui:Description>
+        <mdui:Description xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.insa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.insa.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
+MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
+EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
+VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
+QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
+TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
+6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
+GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
+svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
+7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
+p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
+QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
+GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
+CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
+jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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://cafernp.insa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafernp.insa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafernp.insa.gov.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">insa.gov.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElOU0ExDDAK
+BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUcHBhY2hlY29AaW5zYS5nb3YuYnIx
+FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
+VQQGEwJCUjEcMBoGA1UEAxMTY2FmZXJucC5pbnNhLmdvdi5icjAeFw0xMzA5MDUx
+MTQ3MDRaFw0xNjA5MDQxMTQ3MDRaMIGYMQ0wCwYDVQQKEwRJTlNBMQwwCgYDVQQL
+EwNDUEQxIzAhBgkqhkiG9w0BCQEWFHBwYWNoZWNvQGluc2EuZ292LmJyMRcwFQYD
+VQQHEw5DYW1waW5hIEdyYW5kZTEQMA4GA1UECBMHUGFyYWliYTELMAkGA1UEBhMC
+QlIxHDAaBgNVBAMTE2NhZmVybnAuaW5zYS5nb3YuYnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC6e7hlynC3DhhZh4vMpmlAGM9jGjQIRJNXmDIBU+YN
+TVhwfM8+HzMGuUhqPdoFL2aGJmJVn5TRsOjAIlK6TuHYPVJjZFrV5CGaimuXDkqH
+6nFgKoFLI6Zg0+vNUOGIQvfT1TpZaonPRqIu4MpKEDEtEk8bFkfsqxq55ivcLLYp
+GwGTZMGGBcaAztR0GRBooh3WDLIQR9gkzhxeTHEPiwF5jXGLIFZNR+kxo1ddmg4j
+svohDefVHSkTQZt6QptsGVa408tn2pokQ4K8Enmi9zMdR6LuKvdhoC8Rs1Cc8rlJ
+7Kj5KOMmOjniR03aokncdqNoBIUBijfV0gI58L1Uca53AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAGVgBV46eVFwW+kASWxOC3FprDP5q/1GDcaD3rKu471uU+nd/L5n
+p5xIKFBVIhx42FbAW7wpLRvhjPDCRDlXVKBgthbWGFawAyjtfPwJvR0aAowP0xHX
+QFFg7t0AXj88u89109tEaxLXpm7tzPHUiuk/D/ZtFy1JtJxZfLPHII5q53ioxF7A
+GgD+wSudqXEc3gKs2bynFcvlWgiali2b3dxNWZ5qRP652Mebtdl4H67/bSsKnhEX
+CcE/6M9wD9oWIdgaoL49rKZnU3ubSz0A5AwNhZiqGk70SbcAYrVWfZH1ApyBnt+8
+jMogdK5eP4afg8zXeCSXaDF45MMQP7+gRsY=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.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">INSA - Instituto Nacional do Semiarido</OrganizationName>
+    <OrganizationName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.insa.gov.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.insa.gov.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Pedro Pacheco</SurName>
+    <EmailAddress>ppacheco@insa.gov.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br.xml b/swamid-interfederations-2.0/cafetools.ufpi.br.xml
new file mode 100644
index 00000000..f3684dde
--- /dev/null
+++ b/swamid-interfederations-2.0/cafetools.ufpi.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPI - Universidade Federal do Piaui</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPI - Universidade Federal do Piaui</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpi.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpi.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
+CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
+BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
+NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
+D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
+YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
+CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
+JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
+nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
+y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
+7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
+EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
++d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
+EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
+UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
+DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.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">ufpi.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDqjCCApICAQAwDQYJKoZIhvcNAQEFBQAwgZoxJjAkBgNVBAoTHVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0B
+CQEWD250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgT
+BVBpYXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMB4XDTEzMDcx
+NTE4NDUxMVoXDTE2MDcxNDE4NDUxMVowgZoxJjAkBgNVBAoTHVVuaXZlcnNpZGFk
+ZSBGZWRlcmFsIGRvIFBpYXVpMQwwCgYDVQQLEwNOVEkxHjAcBgkqhkiG9w0BCQEW
+D250aUB1ZnBpLmVkdS5icjERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBp
+YXVpMQswCQYDVQQGEwJCUjESMBAGA1UEAxMJY2FmZXRvb2xzMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqkjRNJykzf+pYQwfB+HpWRnkVcg+lLI/wjQj
+CNfcjNeSFsXRVaPCrWzVJ6DlMnYM1sxkp9b+We5B5/t4P92XM+ZeFLvFEd5kbi50
+JlAqFLVQxVBjLJdJ9AvUxMn55bQAh9mw4ANMb0U0iYcB25POJ6vWjxCuQR68xV4t
+nqgYOk8/d299pXxeZd8VMPfasfazzov1fa2aqpdrb8dqX+6/RMJm71d3nBHsPJuO
+y5ixRrE3HHYS8K52Eah59GY0NBF3EpearDjCI/W2KVmMJE6kNtMDkq8cjOGLZCsb
+7sEb/uLpWn0Sxd7NPc6VkRzN5m1eFe4dQB3rz1dy9ngEa+GQjwIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQBfGXW54W7Y8WE5naezc3cFKrxErBdQ5ZvViX77Bsc3uNal
+EE2cXAkaYQbwKRa9Pp2zpkkr/wSKu2gZ1OwH4y8tWZf3kKzwxZa41fj2drWHYC88
++d4igeWI86UWoIA9HcQ9LZtY6gZSqpkaeOeKniFR/xTXrOwFOtreWkkZ6w4mhCAj
+EEK4mjitPz1kjBkaaZcnDOYysPjZ7Iq5mrEFwVvW6xXSs0LnGevKMig8Bi8Kr+nW
+UXJvN7r9gpaML2SGcEcAmqVExt2IuPrtUGvIS7CaN3+gaFAC53gmK+30nwLwvBkC
+DqmYcKWK/3TMzk3nUXEJx2H36Knb+Hv/Hig1rx35
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.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">UFPI - Univerisdade Federal do Piaui</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufpi.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Arinaldo Silva</SurName>
+    <EmailAddress>arinaldo@ufpi.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
new file mode 100644
index 00000000..182a3440
--- /dev/null
+++ b/swamid-interfederations-2.0/capuccino.iff.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://capuccino.iff.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">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFF - Instituto Federal Fluminense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFF - Instituto Federal Fluminense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.iff.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.iff.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
+byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
+CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
+emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
+by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
+JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
+BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
+Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
+HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
+aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
+BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
+thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
+M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
+FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
+HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
+WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
+qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
+DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
+sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.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>
+      
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
+byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
+CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
+emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
+by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
+JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
+BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
+Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
+HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
+aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
+BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
+thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
+M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
+FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
+HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
+WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
+qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
+DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
+sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.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">IFF - Instituto Federal Fluminense</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.iff.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Andre de Azevedo Cunha</SurName>
+    <EmailAddress>acunha@iff.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
new file mode 100644
index 00000000..e88d87cc
--- /dev/null
+++ b/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
@@ -0,0 +1,120 @@
+<?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://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrn.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrn.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
+VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
+BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
+HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
+VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
+MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
+ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
+cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
+ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
+cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
+aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
++5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
+aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
+UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
+MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
+o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
+VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
+waiW5wfG
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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://capuccino.info.ufrn.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.info.ufrn.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.info.ufrn.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">ufrn.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
+VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
+BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
+HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
+VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
+MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
+ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
+cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
+ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
+cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
+aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
++5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
+Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
+rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
+g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
+rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
+U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
+aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
+UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
+MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
+o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
+VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
+waiW5wfG
+            
+	
+		
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.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">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufrn.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>SINFO</SurName>
+    <EmailAddress>redes@info.ufrn.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cuni.cz.xml b/swamid-interfederations-2.0/cas.cuni.cz.xml
new file mode 100644
index 00000000..5fdc0303
--- /dev/null
+++ b/swamid-interfederations-2.0/cas.cuni.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://cas.cuni.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">cuni.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Charles University in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Karlova v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Charles University students and staff</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Univerzity Karlovy v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="41">https://ldap.cuni.cz/images/UK_logo_40.png</mdui:Logo>
+        <mdui:Logo height="89" width="91">https://ldap.cuni.cz/images/UK_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
+EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
+NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
+aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
+m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
+OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
+fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
+z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
+wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
+BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
+uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
+8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
+SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
+NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
+slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
+dXLpqi4=
+		   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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://cas.cuni.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cuni.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.cuni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cuni.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">cuni.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMTCCAhmgAwIBAgIJAIg6vQLFes01MA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
+EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xMDAxMTgxMjI5NDBaFw0xNTAxMTcxMjI5
+NDBaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
+aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMitOw5poPyXXhWeoWH0Mv7Vh3LzebgJXTB0hD5RX8zh
+m5ark9nTZWjURtq8scacbnu8Nn2GN6HIF4gTLuxLMWgupLr42da+npTZLMGQVxw8
+OXAGEt+zFKMcXYyJpxbCX3u97U5ck/ldjA6F1Wkr7IOrRlwElAagbCBtDFgUGUpd
+fqis+CN6J8RknhOxK2f2K1RvI3LqIBHyH8KVMtzD9NohFhoAwyn+5B+IgY2ELz12
+z/g3LMGT1Kfk60l48N2XJ8yVcqMawO3SSqQvexzwYzXkxXEZQ7AsK/4pcOS/37nl
+wp2Y9nMbr1EwBYtcOqMJsQBigCMQopLUsFa+MFHUlu0CAwEAAaMaMBgwFgYDVR0R
+BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBABLSe4N6jpCVYOzi
+uiXPPMUzwIAoB0Pt+SnAw8+B72TjDqSjcIfep2OHUQfIu1CEoIz8eBtAQfEledH7
+8Y17rdxORqvWoFTLHmqBQ9odZyBUeQxuIPjdfG7bffrJQQ2AmcP6oV9Cu9o6f8c/
+SqAclnKkc8CPh81rPMdi16uL6zXd4kOshNmLWq0RQjnnDC7ycY721kqB1t0zkJie
+NS5+gGbsQg+/38B48iSW046pedzrbguM0wi7x0gjDmYtjspE9RNl7LYEojXGV4I3
+slrydvu/w8Xr7BtsmNkU7jsyAj8iNC4CAwDPk0qE/Qlhxlcv/Ieis1hmGzNgqZAg
+dXLpqi4=
+		   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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="cs">Univerzita Karlova v Praze</OrganizationName>
+    <OrganizationName xml:lang="en">Charles University in Prague</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Univerzita Karlova v Praze</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Charles University in Prague</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.cuni.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Michal</GivenName>
+    <SurName>Vocu</SurName>
+    <EmailAddress>michal@cuni.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
new file mode 100644
index 00000000..ef5c0ea6
--- /dev/null
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
+        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
+        <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:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
+MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
+HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
+7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
+sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
+uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
+G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
+mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
+rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
+gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
+hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
+YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
+MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
+uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
++HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
+/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
+kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
+sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
+Ew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=clarin.ids-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIEEGkCyTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDA3MjMxMjA0MDlaFw0xNTA3
+MjIxMjA0MDlaMFUxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR8wHQYDVQQDExZjbGFyaW4uaWRzLW1hbm5oZWltLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HSq1u4QtWz4jz2ZsYrw
+HLTxxq3PIxmkC/byX/fcdo68NYovgdpHmp1FzR2ZTSULPOvRUf/sgwgRcoSwu2Ar
+7qYuMg8BJx/tKkN1kL4UYSI5eNuENw6tsdLm0HVbuszMCAgQaMHouFa5d0jHMdsG
+sh/UKzztdaUE9CiYQ2s6pbNse5A0f0c8tU8OqQdxRDHgmSLCEsUO7MRz8x2y8gST
+uroXAyqgw177Gj+HEyRDLiOciJRP1Mo9k9WlqQKd0NkozGfa9l/cHGkgx4bRscoh
+G+KssEE6zZ4lgeMHp6gCZrIq6xuhmSMb5+LTjbLcRT1B3SCUMmldleDlfCNjCD+i
+mQIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSpwD4M10rk6JzMwjRV+pON
+rTYX0TAfBgNVHSMEGDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zAlBgNVHREEHjAc
+gRpzY2hvbmVmZWxkQGlkcy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
+hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
+YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
+MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAIfABIseLPXh8WgPco+Pk
+uDdU8lbUkY7mwTUd2hOYz/uLAUcqXu24TPUlw2PR++EkoHpM6ocoRHrV/Pz9RcdK
++HXk4df5XPRrMMUu3WkOkZ+ea+ZWehS+AIrfVGz0+eoJraxF4B20571PFlamI7K7
+/zGhNTTHgB6d74dCcS9qCqP7hBaDqTDnN4DAm+gv+wFLVECh13YZyDlkvWKk7RZP
+kcFj6qC0guBXN8wZN7fSiOZUxTAxhD5Z04yjCiMcoXQKg5VMlCR+eLE/W/9gc58P
+sYKNO2ByhVB/TVmh+1gYoPCId/EM4DmonEQXRp3wEm6n+vhIqRShGjbi7FWDPimB
+Ew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</ServiceName>
+      <ServiceName xml:lang="en">Institut für Deutsche Sprache (IDS) - CLARIN services</ServiceName>
+      <ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">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/clarino.uib.no.xml b/swamid-interfederations-2.0/clarino.uib.no.xml
new file mode 100644
index 00000000..03ed1317
--- /dev/null
+++ b/swamid-interfederations-2.0/clarino.uib.no.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarino.uib.no/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-08-20T06:55:04Z">
+      <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">Clarino, UiB</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Clarino, UiB</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</mdui:Description>
+        <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</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>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVpYi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZmm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiXDsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15frhNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WChsbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDWdy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8RpiXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNzLnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB820waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7EzRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
+    <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://clarino.uib.no/feide/assertion-consumer" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="no">Clarino, UiB</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the European CLARIN initiative.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til det europeiske CLARIN-initiativet.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="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"/>
+      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bergen</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Bergen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uib.no/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uib.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meurer</md:SurName>
+    <md:EmailAddress>paul.meurer@uni.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
new file mode 100644
index 00000000..dbe77c4e
--- /dev/null
+++ b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cloudidp1.canarie.ca/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-03-25T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="https://cloudidp1.canarie.ca/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">cloudidp1.canarie.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">CANARIE Fournisseur nuagique d'identité</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CANARIE Cloud Identity Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CANARIE - CAF Canada's Advanced Research and Innovation Network </mdui:Description>
+        <mdui:Description xml:lang="fr">CANARIE - CAF-FCA Le réseau évolué de recherche et d'innovation du Canada </mdui:Description>
+        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>canarie.ca</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
+bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
+MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
+MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
+MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
+BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
+q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
+HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
+7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
+0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
+kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
+ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
+VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
+KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
+/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
+HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cloudidp1.canarie.ca/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">cloudidp1.canarie.ca</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
+bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
+MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
+MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
+MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
+BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
+q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
+HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
+7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
+0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
+kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
+ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
+VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
+KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
+/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
+HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CANARIE</OrganizationName>
+    <OrganizationName xml:lang="fr">CANARIE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CANARIE - CAF Cloud IdP - Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">
+CANARIE - CAF-FCA - Fournisseur nuagique d'identité - Le réseau évolué de recherche et d'innovation du Canada
+</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Network Operations Center</SurName>
+    <EmailAddress>noc@canarie.ca</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net.xml
new file mode 100644
index 00000000..538bffd8
--- /dev/null
+++ b/swamid-interfederations-2.0/community.ja.net.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://community.ja.net/shibboleth">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://community.ja.net/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://community.ja.net/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Janet Community</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The community driven, social business, support, and information website for Janet products and services.</mdui:Description>
+        <mdui:Logo height="227" width="500">https://community.ja.net/sites/all/themes/janetbootstrap/logo_500x227.png</mdui:Logo>
+        <mdui:Logo height="109" width="240">https://community.ja.net/sites/all/themes/janetbootstrap/logo_240x109.png</mdui:Logo>
+        <mdui:Logo height="45" width="100">https://community.ja.net/sites/all/themes/janetbootstrap/logo_100x45.png</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://community.ja.net/sites/all/themes/janetbootstrap/logo_75x75.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC9zCCAd+gAwIBAgIJAK3QNCbDRJQ8MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+						BAMTEGNvbW11bml0eS5qYS5uZXQwHhcNMTIwMjEwMTEyMzUzWhcNMjIwMjA3MTEy
+						MzUzWjAbMRkwFwYDVQQDExBjb21tdW5pdHkuamEubmV0MIIBIjANBgkqhkiG9w0B
+						AQEFAAOCAQ8AMIIBCgKCAQEAw39KjoNd8jwDOrw9GjxK6BGgk6YqR9CRd0YVbtlp
+						Kfpai5oueTqApoBfwQYiGQWloLbtCk6GG6j8YRpvlwrlOjoOR0+gUvz0yp+q6igx
+						o6lgJU2zzWWrTbt+oT9BGhFyYUj2EMbLkX8VWzyebKr3kS8ioVZlLjQ3ZWJcHa8Z
+						Dx7EVFEb/w/tEeIZP5ytz4/j5OLUA2oJzEO2U07dMsVTkpKVdQwatG5REgPrbC6B
+						+/QZOoURlABAav3m0v4++spVgYbzVJSRbQ1v5sxwVSGuSS0JoY4YADG7mxMv2e69
+						PkThTkxO36boOpZe1NJxrwKJXHSg8UoroG2iW4Rz/7OWhQIDAQABoz4wPDAbBgNV
+						HREEFDASghBjb21tdW5pdHkuamEubmV0MB0GA1UdDgQWBBTMN93e5HUiaDJVqZ8F
+						9SsogJ0U9DANBgkqhkiG9w0BAQUFAAOCAQEAKTkm2So0rhPk13AB436H0YnSVC24
+						braQWHHqQQOFMrszM/2ThzPnsYQXqKmX9kgCBy7yfufZiLhkYMSU61lGSeWdhVo5
+						v3bVshCenq42mWNM5LE0B5VPCY8WeM9dx7r36FfQRdjXtr85rE3a1ZYNwuu9ZsCS
+						+YO2x3amxRkdmkfCs0hxwu0QOkAjL0fACG0i6fnEYcwWS8ZIawKxYLKe1ktyG5uq
+						PuhVktg4i0oQ8Uk2GlzgvAClfrZqNSi48BTWrKX4GA5zgEhf8HcBaBQhr5q6ONZi
+						0B+wkoo8xl+IxAjKKhkoQxl+Bl9d/rxHOgvMGe/C+83bJ204rfCMdLgGzA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.ja.net/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.ja.net/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.ja.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.ja.net/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.ja.net/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.ja.net/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The Janet Community</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Login Helpdesk</GivenName>
+    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <EmailAddress>mailto:web-submit@ja.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se.xml b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
new file mode 100644
index 00000000..f648a8b1
--- /dev/null
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/kalmar2" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect-beta.sunet.se/Shibboleth.sso/DS/nordu.net" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect8.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect8.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALtpdDetd0+aMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWNvbm5lY3Q4LnN1bmV0LnNlMB4XDTExMDMxODA5MTkxNFoXDTIxMDMxNTA5
+MTkxNFowHDEaMBgGA1UEAxMRY29ubmVjdDguc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQD1d3qbbBDMHcxOLMlEzLthit/PclHFQUivQjdl
+i/iWPBDdTXODRZfYzTcq+B+venAaDJBt99/UF0l+Zept5F/0U8dPmlKXNOHkQtCM
+fP56ssnuMNt56rgUMC7Bkvi0JBsschjzqXzELSn9zw5DO0gj7YU1GGJaYp4abBYg
+LHs403i9Dga6qZvma1nfuBfoSBNcfNPKDfL+LN1KhSyZDrwfupiVXzt4WCm4/B+7
+ypEZw66WK5VCXMJJ8nrzbcP0SV+W36qfkz1Vu1799c0msygmb5bfvlZbVvaH5bXR
+P67w5IWiOZNiJ4KP9SsNKT2u2SSJgFwBhs2m+AghWHW6+rcRAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWNvbm5lY3Q4LnN1bmV0LnNlMB0GA1UdDgQWBBQnXN19r3XLQq+Z
+DWdMGahYti/oYzANBgkqhkiG9w0BAQUFAAOCAQEAMSB60ydAbZlRUOtKEvqoXu9q
+LQ6RD2PbX8BcB494lEANUftFBUPlH6Bssn+uuu+/OTDe0H4rrehGCzoLjziftfQh
+0/a5kfOp8Ws4CY0xEZdm+q0iIl+JTQQbR4AKsVK+2mGquHakkUnCg6fuS1XTsmex
+jDjaYIEYYx7XISnQY/01ZH0oOGCvJAVpW0cEtQzpXmi6a8UOm7xhg0FB0lk4z9v1
+8Yv3mZx1PhYzmXDUVEIfQta/+0SctZ978aj4Y7emDgL1QMdETPyN9OlC3XGNtSYI
+FV4q3nujmHDfDpzbO4vsmaumdoScXaR4CoL/mO9XM7dxx/0k8kMkde1eA1mZWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect8.sunet.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect8.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJALtpdDetd0+aMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWNvbm5lY3Q4LnN1bmV0LnNlMB4XDTExMDMxODA5MTkxNFoXDTIxMDMxNTA5
+MTkxNFowHDEaMBgGA1UEAxMRY29ubmVjdDguc3VuZXQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQD1d3qbbBDMHcxOLMlEzLthit/PclHFQUivQjdl
+i/iWPBDdTXODRZfYzTcq+B+venAaDJBt99/UF0l+Zept5F/0U8dPmlKXNOHkQtCM
+fP56ssnuMNt56rgUMC7Bkvi0JBsschjzqXzELSn9zw5DO0gj7YU1GGJaYp4abBYg
+LHs403i9Dga6qZvma1nfuBfoSBNcfNPKDfL+LN1KhSyZDrwfupiVXzt4WCm4/B+7
+ypEZw66WK5VCXMJJ8nrzbcP0SV+W36qfkz1Vu1799c0msygmb5bfvlZbVvaH5bXR
+P67w5IWiOZNiJ4KP9SsNKT2u2SSJgFwBhs2m+AghWHW6+rcRAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEWNvbm5lY3Q4LnN1bmV0LnNlMB0GA1UdDgQWBBQnXN19r3XLQq+Z
+DWdMGahYti/oYzANBgkqhkiG9w0BAQUFAAOCAQEAMSB60ydAbZlRUOtKEvqoXu9q
+LQ6RD2PbX8BcB494lEANUftFBUPlH6Bssn+uuu+/OTDe0H4rrehGCzoLjziftfQh
+0/a5kfOp8Ws4CY0xEZdm+q0iIl+JTQQbR4AKsVK+2mGquHakkUnCg6fuS1XTsmex
+jDjaYIEYYx7XISnQY/01ZH0oOGCvJAVpW0cEtQzpXmi6a8UOm7xhg0FB0lk4z9v1
+8Yv3mZx1PhYzmXDUVEIfQta/+0SctZ978aj4Y7emDgL1QMdETPyN9OlC3XGNtSYI
+FV4q3nujmHDfDpzbO4vsmaumdoScXaR4CoL/mO9XM7dxx/0k8kMkde1eA1mZWQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-beta.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (beta)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect.sunet.se.xml b/swamid-interfederations-2.0/connect.sunet.se.xml
new file mode 100644
index 00000000..b2f84347
--- /dev/null
+++ b/swamid-interfederations-2.0/connect.sunet.se.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/nordu.net" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.sunet.se/Shibboleth.sso/DS/kalmar2" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect01.acp.sunet.se</ds:KeyName>
+        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
+ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
+ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
+o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
+E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
+xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
+c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
+AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
+czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
+tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
+UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
+Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
+K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
+d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
+0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
+bUs=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>connect01.acp.sunet.se</ds:KeyName>
+        <ds:KeyName>https://connect.sunet.se/shibboleth</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=connect01.acp.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDLjCCAhagAwIBAgIJALJTE8wpfDmAMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFmNvbm5lY3QwMS5hY3Auc3VuZXQuc2UwHhcNMDkwOTAyMTIwNTIwWhcNMTkw
+ODMxMTIwNTIwWjAhMR8wHQYDVQQDExZjb25uZWN0MDEuYWNwLnN1bmV0LnNlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzaNMBLHGgzRrAHLQDUiM+xu6
+ghKwdRqBcg171qVDeA4wSoVJLVeAY2xWKjudYzXtcwqL7qkDcHD3wOd0FLQSFfxE
+o67z4chBMNrkK9b9NgdHWp/Nb8gsdYNZt2ZjJVOD/oWTFXRHZDJhqkXFvVjL1gKu
+E3a2vDK6LRqYCLx5cyFleuRoqBvMrDxKLHvmqxo+Qt2e+ntL1sDVyKeMxgZc2s0/
+xGYFFzSVDT08XrWlgpN0AmxhfC0ULDb8YzQiJxsdeZ3C57RnC0InabCCvzPQsy9t
+c1VU/TNXkkXQn3H5aC+LUu8olnYndtFac56k/OaAUPe15/1MQVXvL8vbGG6JkQID
+AQABo2kwZzBGBgNVHREEPzA9ghZjb25uZWN0MDEuYWNwLnN1bmV0LnNlhiNodHRw
+czovL2Nvbm5lY3Quc3VuZXQuc2Uvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxPAGA++l
+tPOMkUezKJJrwSNAz/0wDQYJKoZIhvcNAQEFBQADggEBADJJgcI6VADyB8749iGB
+UbK97Zav6/YoX3jMH21tpO0+iZyPlfCxlDmNIBSSrHmNIs7g8sBSi+z8ko2IaSKS
+Ya0fI0N+cvBoi+3Wfszq0LpUSu/5pMWiw3DacOCNesR76h+FKD/UPgUL+LDw7ebz
+K3aeVvtsIjPijrcCaUKrZg5dv/5CRx/oQLbV20L3xk5UTTO/RNrR1gef37yEowDd
+d8hQaQgw5uujjjdkr/6u03kjO6rEZAySsiBPGcpBDXAbk4lnJVQltP0MBE4pu+es
+0oZu+lC7LltiBjJxdh/7SaqdLbn7G7cApwQKqXHVFITX9ncVMM04FtM9MzMc9d4y
+bUs=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.sunet.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SUNET E-Meeting Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SUNET E-Meeting Service (Adobe Connect Pro)</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" isRequired="true"/>
+      <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.5.4.42" 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.9" 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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org.xml
index ac7aacde..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org.xml
@@ -1,27 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
         <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
         <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
new file mode 100644
index 00000000..c8444be0
--- /dev/null
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev.emeraldinsight.com/entity">
+  <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>
+    </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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.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://dev.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSzCCAjOgAwIBAgIJAPL5yXP0XbhAMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
+						BAMTH2VtLWwxLXJoLXVhdC5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNTA1MDc1
+						MjEyWhcNMjEwNTAyMDc1MjEyWjAqMSgwJgYDVQQDEx9lbS1sMS1yaC11YXQuZW1l
+						cmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						1cPpwOpncLWxjS6YxesBuUjX7wyxMf01E7nIcYbdxYYiINMnd2j4Mi3uzdG8qqbp
+						INCMvPIgzL2827k28SktsY3AftMAYsAiBDzhFwcUce4mrK3QxofpP+aoH3/oswlZ
+						ur3rxHLJYWy/0aO9NqJvd9M5hh2K8L4TlD/FvedqRfrFuviNXoXzC5WqoSGxuT4R
+						gMP1ChbxzcWvJbhkdHuX/TrDH7lq+NUflJHjXDNsBYO0Ko9IPx9GTwfo0tNth9Ym
+						4PZfz6VY5nl4zlDxMktwcOI9ofzAtjAi2MUTDw9YnETqME9I9ums57ke84HCMXSW
+						0ToxuMcWkyjGsb2TEi4jqwIDAQABo3QwcjBRBgNVHREESjBIgh9lbS1sMS1yaC11
+						YXQuZW1lcmFsZGluc2lnaHQuY29thiVodHRwczovL2Rldi5lbWVyYWxkaW5zaWdo
+						dC5jb20vZW50aXR5MB0GA1UdDgQWBBSZx0zhhju5QWnvVBzwzb1HMBk2tTANBgkq
+						hkiG9w0BAQUFAAOCAQEAbw4E1yg5C8G5wWcWqPi/c8gG2kIyYdUtAoMxoVrF0NCe
+						x0YZUDMLIhUNdHKh1RZMbgKG19pTqUmEjPhfE9VXwfsSIv9QrJiJ2zFH7LbnA7bh
+						qnGVhPzee8x88rpS19GcxYitMzifqMxJ7K2bC2++kN87Z5niseL2nSYntB7EmwJp
+						EvutgzIJJoH7Xg8KieuPVJKaia1RHpcA4QAeuWPgyZ2Ez+zuszlq2650KCXgQreL
+						m0sivyuWv7TZVl8D+cLucd23bwknQLioqhhpdwmXrpcKyRHPaRrf3iznD/cHd0Ps
+						lHVWGtQ0Nh/tJIKoMcDif+nTn+Hm4+au0NFb1pX40A==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: Emerald Development Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://dev.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/dev1.redclara.net.xml b/swamid-interfederations-2.0/dev1.redclara.net.xml
new file mode 100644
index 00000000..7f922f13
--- /dev/null
+++ b/swamid-interfederations-2.0/dev1.redclara.net.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev1.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Communities - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Comunidades - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Communities Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Comunidades de RedCLARA</mdui:Description>
+        <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev1.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dev1.redclara.net/Shibboleth.sso/DS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
+ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
+VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
+WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
+BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
+XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
+iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
+mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
+8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
+3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
+sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
+BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
+IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
+kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
+ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
+ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
+VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
+WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
+BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
+XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
+iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
+mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
+8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
+3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
+sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
+BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
+IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
+kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
+ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev1.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev1.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md: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
new file mode 100644
index 00000000..240a7c7b
--- /dev/null
+++ b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dimorus.intranet.ifrj.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifrj.ed.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifrj.ed.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
+STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
+UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
+EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
+NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
+VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
+Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
+AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
+DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
+omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
+k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
+2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
+3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
+/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
+gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
+/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
+STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
+UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
+EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
+NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
+VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
+DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
+BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
+Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
+AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
+DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
+omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
+k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
+2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
+3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
+/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
+gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
+/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifrj.ed.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifrj.ed.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marcos Velten</SurName>
+    <EmailAddress>suporte@ifrj.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
new file mode 100644
index 00000000..d5b2ab27
--- /dev/null
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
@@ -0,0 +1,94 @@
+<?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:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DOCCOM  Deutsch Universität Bern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DOCCOM  German University Bern</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</mdui:Description>
+        <mdui:Description xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://doccom.iml.unibe.ch/Customizing/global/agreement/privacypolicy_en.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
+bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOhYMrsybcgVoGyCv
+e0LbV/g0KY4wDQYJKoZIhvcNAQEFBQADggEBALBQa19gPMqwHXd99gQGCc1GlahH
+CCuamxAQ0xXo0OpI0LM4kEmKsTA7w5HHtmRuWpX/OgnMLKG24U3dpJ+CDx9qKSQM
+KnNa9RKpoMuUYKeLegI4nf9vorPWHmvKaUX++h+MI9kdhiiwmR0nt1AW+UvhfHvF
+8kwaGHEJMO1KQGWR6D5uVrKiUUhILpkugMyR6bNrgaRSu6in8f44dx29sZ6O7foR
+/93yAZH2B9ihx76bpjpi3YkbGBqkzCtN2S0D/3u+dTAsZMC784BI93/F0/QBHYt6
+WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
+						</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://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</ServiceName>
+      <ServiceName xml:lang="en">DOCCOM  German University Bern</ServiceName>
+      <ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</ServiceDescription>
+      <ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">unibe.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Bern</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Bern</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.unibe.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unibe.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Michel</GivenName>
+    <SurName>Adrian</SurName>
+    <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>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org.xml
new file mode 100644
index 00000000..6563a007
--- /dev/null
+++ b/swamid-interfederations-2.0/doit.swisdom.org.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doit.swisdom.org/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-12-30T19:03:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">DOIT - Dermatology eLearning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Dermatology Online with Interactive Technology</mdui:Description>
+        <mdui:Keywords xml:lang="it">elearning dermatologie</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">dermatologie elearning</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">elearning dermatology</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">elearning dermatologie</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAW5JREFUeJzUUT+rgnAUtSL6EC1tDY0hro5hZUtFLS0NDUFDkEGNImIQkvQHgjIjHCIoKKOkNxgOBQ1+g77KOz3DF+5veHe7v3vuueecH0H8eYVCoUAg4LXFYnE0GlmWdTgcRFHMZDLeKBwOB4PBd1MqlSaTyfF4PJ1O0+m0Wq02Gg1N0y6Xi2maiqJks9k3tFKpnM/n/X4/GAwKhYLHl06nwZLL5Vqt1nw+32w2vV4vHo8TgiA8n8/FYsGy7KfUTqeDCzirqqpt2xC5XC6j0ehrRtP0eDx+PB6O42CzVqu5O6lUiuf53W5nGAbDMJDXbreJSCTijmFgOBxKkgQbXz+1Xq+bzWa5XMYFAEC6Wq1+NQABDrwiqEQiQVFUPp+fzWYA3e93AEAHJy+oG2symeQ4Dpnebrftdgtt1+u13+/X63WSJAGQZRmJvek9YW7eiEXX9Vgs5osBYfr/8XPT13a7Xbj3L/zH+gYAAP//AwCk1qMzXSJnzgAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="25" width="68">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEQAAAAZCAIAAAAHYR/MAAAD72lDQ1BJQ0NQcm9maWxlAAB4nI1V3W/bVBQ/iW9cpBY/oLGODhWLr1VTW7kbGq3GBkmTpelCGrnN2CqkyXVuGlPXNrbTbVWf9gJvDPgDgLIHHpB4QhoMxPay7QG0SVNBFdUkpD102kBok/aCqnCur1O7Xca4ka9/Oed3Pu/RNUDHV5rjmEkZYN7yXTWfkY+fmJY7ViEJz0En9ECnpntOulwuAi7GhUfWw18hwd43B9rr/3N1VqmnAySeQmxXPX0e8WmAlKk7rg8g3kb58CnfQdzxPOIdLiaIWGF4luMswzMcHw84U+ooYpaLpNe1KuIlxP0zMflsDPMcgrUjTy3qGrrMelF27Zph0li6T1D/zzVvNlrxevHp8uYmj+K7j9Ved8fUEH+ua7lJxC8jvub4GSZ/FfG9xlwljXgvQPKZmnukwvnJNxbrU+8g3om4aviFqVC+aM2UJrhtcnnOPqqGnGu6N4o9gxcR36rTQpHnI0CVZnOsX4h7642x0L8w7i1M5lp+FuujJe5HcN/TxsuIexB/6NrqBM9ZWKZmXuX+hSuOXw5zENYts1TkPolEvaDGQO7Xp8a4LTng4yFyWzJdM44UQv6SYwaziLmR825DrYScG5qby3M/5D61KqHP1K6qlmW9HUR8GI4lNKBgwwzuOliwATKokIcMvh1wUVMDA0yUUNRSlBiJp2EOZe155YDDccSYDazXmTVGac/hEe6EHJt0E4Xsx+cgKZJDZJiMgEzeJG+RwySL0hFycNO2HIvPYt3Z9PM+NNAr4x2DzLmeRl8U76x70tCvf/T3Fmv7kZxpK594B8DDDrSYA/H6ry79sCvysUIuvHuz6+oSTDypv6nbqfXUCu6rqbWIkfo9tYa/VUhjbmaQ0Tw+RpCHF8sgXsNlfHzQcP8DeXaMtyVizTrXE2lYJ+gHpYclONsfSZXflD+VFeUL5bxyd1uX23ZJ+FT4VvhR+E74XvgZZOGScFn4SbgifCNcjJ3V4+dj8+yDelvVMk27XlMwpYy0W3pJykovSK9Ixcif1C0NSWPSHtTs3jy3eLx4LQacwL3V1faxOK+CWgNOBRV4QYctOLNt/kNr0kuGSGHb1A6zWW4xxJyYFdMgi3vFEXFIHGe4lZ+4B3UjuOe2TJ3+mApojBWvcyCYOjarzHoh0HlAfXraZxftqO2ccY3Zui/vU5TX5TR+qqhcsPTBflkzTTlQebJLPeou0OogsO8gv6IfqMH3LbHzeiTz3wY49BfeWTci2XQD4GsPoPu1SNaHd+KznwFcOKA33IXwzk8kfgHwavv38X9dGbybbjWbD/C+6vgEYOPjZvOf5WZz40v0vwZwyfwXWQBxeO6COJEAAAkjaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA0LjQuMCI+CiAgIDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgIAo8P3hwYWNrZXQgZW5kPSJ3Ij8+p930kgAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAA/VJREFUeJzslkko7XEUxy1tLdmRDfU2NjJEylDGkqFMKQtEWCjKEJJcLwtKEYkioSRD5ikZHxEyZRYSC0UpFu99uqf36/b/33vfu1Kvp3sWt9895/zO7/c9w/f3d3Cwi13sYheL4u/v39XVtby8fHl5ubu7OzMzU15e7urq+q/vZYvExMT09fUdHh4+PT0tLCzU19f7+vrGxcX19vZubW29vr5ub2+zBqr1OG5ubg0NDXt7e9+NUlNTExYWZtbTycmpra1tYGDAz89PNI6Ojs3NzQaDQf39ZpTo6OiCggJSPDc3V1hYaPHsqKiowcHBi4uL29vbsbGxzMxMQujdPDw8amtrFxcXn5+fAdzR0eHl5aV3Ky4uBvZPnbAlMjJSuVVVVR0cHNzd3Yn1/v5eKg9y/k5OTjY2NuqDkOXh4WFnZ2czMEpLS/f39wVDSkqKRbi6dAJ4enp6Z2eHVkxLSzO11tXVzc/PczBlTE1NraiomJ2dFXjkS9JEjt/f39vb2yMiIqg/a6xNTU2YqKSAGRoaIjgdzi+a9fV1b29vi3cKDAyUhLm4uFi5OtHxOTs7+2EULgoMDkPPXd3d3RMSEjSVRE9k7qE0+fn5ktr09HT+Hh8fX11dqV0TExOYCMuayKzBaXoBZbUmtM3JycnLywsTkpWVZba7ROgBGjcoKCg5ObmysnJzc5Nmo6q0R3x8vB6//niaCiUmWoAFs6dMJSUlCryAwU0TDf0fwIgkJibSZjSboIK4zDel0ZMsktfOzk5p8dHR0ZWVFbNgNMdTVZRFRUVsYZGRkaFMUklogDUp0IAZGRmxAYxIUlLS29sbJ9HZtDidCqV4enpSLnI5Pj4OhqWlpZycHGgKSLKLsjCUfwPm/Pyc2SCgzICPj48yyazL0FIf1sBTVqmVbWCAsbGxIeuAgADagL/0EoHg5dbWVthMrGVlZTc3N7KGhXHQPEECZmpqSmlCQkLQwIQOv0tkWhnYlhGS9eeAIQopDw8Ph6ws+dB+TA6TRnSlZI1SD4YrKg1c9PDwIFS+traGtb+/X0zUivaGAz8TDE0FmT4+PtIMR0dH3d3dCpU8ZNfX1xQKWltdXWVmTMGQAj0Y2hXwNA9DxXuieII3DSsAePvYCDEAVe0VMLy5GjDwuw1glNAz8BWXhql4BBh6qPn09DQ7O9usvyaRSGxsrLwMjJMsSL+yBgcHg0S9g3wumfKNgDGldYgBDcz5ETAiVKOlpYXbwAo9PT1WWJvvNw0YnMkCheXe8Ip+S15eHjRAxSi4JnJ1dTXsYvptkZubiydbPg5GhCrxeWbdRw/mP5YvBYbp+jpgQkNDrbC5XezyBeQXAAAA//8DAMcQPBACQuP6AAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFGjCCBAKgAwIBAgIUH6a66qr+t+IWYDox5Q4z6Z/jwRIwDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTExMDgyMjA5Mjc0MVoXDTE0MDgyMjA5Mjc0MVow
+azELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJp
+Y2gxHTAbBgNVBAoTFFVuaXZlcnNpdGFldCBadWVyaWNoMRkwFwYDVQQDExBkb2l0
+LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l3V
+hk4B1KbWNgNTpZ+cpM46T60jD2djhERx1mjhUIPVCSoSWBFnDcuaWVHw3hiiHRQ3
+Ak1SuXPGqT+oE4ATggPvgQmeD1BVv69dIwRf8k8ykJNlHYmaNFOjTAPmfPCUUZMB
++U0WY5+L//HVrgEzESDJgNzLV/qipXtpj9ysXTLJqJ3kwiZ+bT7KyxVXP4YEocgl
+NDVib5r6IdsvUw9Bm5ot08ZbGjKsO+uD592LV3pNib71Q6sSYcoX/a2seCnvSLBk
+v/pQple2/uSY+U+eWfRcvyOSdaByYsTNGW54XEbG2CPph7WJyyhjKJkIelnXM/NR
+bjj3oIV93uF27WXgtwIDAQABo4IBtDCCAbAwdAYIKwYBBQUHAQEEaDBmMCoGCCsG
+AQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUH
+MAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0
+MDkGA1UdEQQyMDCCEGRvaXQuc3dpc2RvbS5vcmeBHHZhaGlkLmRqYW1laUBhY2Nl
+c3MudW5pemguY2gwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEF
+BQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAO
+BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8G
+A1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyG
+Kmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNV
+HQ4EFgQUUFbI+ZNiU0fJ5tEkSatBhp6bJMAwDQYJKoZIhvcNAQEFBQADggEBAFgw
+pn5FmKkSXJS6UG3iYc5P6kDot0Ge5KB3o+Te4BaxG8IpLn/NRR1AU0WPgm/hqPA0
+RhRvxLEVLEU4zhShGURP2oTiaBkT3ArudACCw1yHFrY9+lQyMqlZeS0sgtS3RMRB
+PZFK09Z58q6U3oYHwjdjbDZgwz7e9vOYtN7uq7Yq1i1KMXiyUcGxH0xMXNXTpkl5
+7OfkKu3EolCAS7PA9pfU7rqeUC220Yaep7wZzml1kRa7Lcd61K3RHzXzY1ZynJSV
+oVuVfr2B07T4UxQr8qSyAc7CQ6OQII8R2ICM3efjlrDBI3kcvUAoxP2s2ynIERbc
+MwW3NDMLS+8yP8MK9rI=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cyberderm.net/Shibboleth.sso/SAML2/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cyberderm.net/Shibboleth.sso/SAML/POST" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cyberderm.net/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="20"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">DOIT - Dermatology eLearning</ServiceName>
+      <ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</ServiceDescription>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">uzh.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Zürich</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Zurich</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uzh.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uzh.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Vahid</GivenName>
+    <SurName>Djamei</SurName>
+    <EmailAddress>mailto:vahid.djamei@uzh.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DOIT</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:doit@derm.uzh.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dourado.ufs.br.xml b/swamid-interfederations-2.0/dourado.ufs.br.xml
new file mode 100644
index 00000000..0e42efef
--- /dev/null
+++ b/swamid-interfederations-2.0/dourado.ufs.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://dourado.ufs.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">ufs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFS - Universidade Federal de Sergipe</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFS - Universidade Federal de Sergipe</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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://dourado.ufs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dourado.ufs.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dourado.ufs.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dourado.ufs.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">ufs.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.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">UFS - Universidade Federal de Sergipe</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufs.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufs.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Rodrigus Oliveira Feitosa</SurName>
+    <EmailAddress>rodrigus@ufs.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/du-idp.lanet.lv.xml b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
new file mode 100644
index 00000000..5bdc834c
--- /dev/null
+++ b/swamid-interfederations-2.0/du-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://du-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://du-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - DU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Daugavpils University - DU IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.du.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
new file mode 100644
index 00000000..994d2985
--- /dev/null
+++ b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-02-17T11:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">E-LOCAL courses of languages and cultures.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture.</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</mdui:Description>
+        <mdui:Description xml:lang="it">Corsi di lingua e cultura finlandese, italiana, nederlandese, polacca, portoghese e ungherese. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=291</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=292</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=289</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=290</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://e-localcourses.unibo.it/Shibboleth.sso/UniboAuth"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>e-localcourses.unibo.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e-localcourses.unibo.it</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJQYlu3GGLHwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+                            BAMTF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB4XDTEzMDkzMDE1MzU1NVoXDTE4
+                            MDkyOTE1MzU1NVowIjEgMB4GA1UEAxMXZS1sb2NhbGNvdXJzZXMudW5pYm8uaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWEo6p5B59kOr233RKoan
+                            vSs7+6MP9DMeLgFE2IGbhiTtr8E9FAvCw2lWB1Xew5GHzQ1rVZl9DHQB3xYj3K1b
+                            vQ6ZTsgITqh65VJHtNguLWezB98rl8LkxPRP0iUH1BLfoL4Dg9BPm/PIxUCv0+Bf
+                            Hl5G8aLzSrdTnrd7tAIw8aLsy0At/5v5ShlU8KcM4K5mqrCS7SSZ7micIp6IFQkH
+                            L6Ctqu8u9NznYvhEBmtz7N/z4CIk2yUTx7zjwPs68Ke79T/rAbvuAb8dTSwrgKDq
+                            MtTR9Romp57roAfS60NH8fVOs+wsGD/q36fV7Gd98SsP9nmHwf1z+dlt6VXSA+Px
+                            AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB0G
+                            A1UdDgQWBBT+SDB/78eV3AEQ1vDdZeTY+VBHQDANBgkqhkiG9w0BAQUFAAOCAQEA
+                            hTIVSita3rHPnKHeMKo17BjlrAZWihiAqKQe8WYxlkH/84FC3ZX0Y9U5rP41bYEV
+                            AjWaF22S1/zbVIxexnYLSiClxRykeEF/wsvFlDmLWSNaPFU8lEwlRUWPg3QOQOX0
+                            cX4GWkWRbeqjJNk9glo03imCXd6b8YVFJS5TxWTSzpzRrNkS3RMGRGKNZENWbyI5
+                            breUwiWdYuGgtTg4LZAjpb/ZygN0jF9b53lmKFpUEWXKblRluTcQQCss5Y8/Q82O
+                            XV33ikbzfFfZt6+Vl/jpXoforcFOpiiAbgKIsBnd95VtuBsBvRl+pzh3xdA2YQXS
+                            VrUi/sMWebysPZ53w+Pc5Q==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute xmlns="urn:oasis:names:tc:SAML:2.0:metadata" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">E-LOCAL courses of languages and cultures provided by University of Bologna</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unibo.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>cesia-sso-support@unibo.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/e5.onthehub.com.xml b/swamid-interfederations-2.0/e5.onthehub.com.xml
new file mode 100644
index 00000000..48b68c2b
--- /dev/null
+++ b/swamid-interfederations-2.0/e5.onthehub.com.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e5.onthehub.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
+MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
+VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
+CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
+C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
+kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
+BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
+AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
+kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
+wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
+27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
+/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
+tsXRh8I9G2b+om6fhCjEUmM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
+MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
+61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
+YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
+j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
+4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
+UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
+AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
+gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
+VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
+K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
+eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
+l8qQhkUldJphTqx2PEHORBM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKbfgH7m+qqbMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMzAyMTQxNjU2MjJaFw0yMzAyMTIxNjU2
+MjJaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMPdcbl3hSq/42be9Xa5j7utNC0Ul1yS4JGLq4nEOP00
+VKMpzHAPTVZyc4h/vffPvVo0sEJ8s6qpcb9dnPZpKj4S2Jg5tWBtmJaZw6TsyOn0
+CHLox9NCwxS8Zz6DIRfuVY2ra+X8a5FR45voE80yeuB6AXH6hfOt81a6EYYAcCe2
+C8PocbRBBabRttUC8mMlcwBd22zO3k9guOJtpfMnCrBrl777h4g9zecLkVcdKwMB
+kmiGRxxYsCNeJUV5rVp6dwbVxPCnktRfavF43Fs8F7W11XKUoa4oS+BONM7IXtz5
+BirkXphcFit7KOFpeXENIXs2AKBwfcp5AvYZy6M6BX8CAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQU5L1EIH24QVlXj4VDtjBocWPsrXEwDQYJKoZIhvcNAQEFBQADggEB
+AGAqH+9sP0Msq8iAj4AZv/TUHziUzCqwNQtfjKSHRkuT1mM5y7M78CVfdPpMYdCc
+kcnYDc3O2S8lliPcTKSrnEE24gPonVxoALCgdLf+oWaA+1BP1T66HDuXkM7NOuH5
+wySxOT3jXmNxymoGsVrT4f2k5Zt9+JCiLIiEJDXzqpJ+6H9k39YBtnUR+EooQr9m
+27vpFCFJWdvxCaRAJzB6ALkdtepu6GAn2ZR+jlJKB2ZheIFcEpuxphtbqFNc37S0
+/RHXXZ7eJ4LIqg7QHc+bvhjPRwx74BajIntgwn5YbOyYWvBU2rEYS41bdNo/6p4S
+tsXRh8I9G2b+om6fhCjEUmM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>e5.onthehub.com</ds:KeyName>
+        <ds:KeyName>https://e5.onthehub.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=e5.onthehub.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDTCCAfWgAwIBAgIJAKiojggOXwYSMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2U1Lm9udGhlaHViLmNvbTAeFw0xMDAzMTkxODA0MjlaFw0xMzAzMTgxODA0
+MjlaMBoxGDAWBgNVBAMTD2U1Lm9udGhlaHViLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALQ7NHoOjHN6VTNmMUBqlDXcbEbgjPcrjlMrW5s3JNWh
+61NT+AD+8+K0m4288Rc4yTuyaYcCc6K+erCPkivkktudh4rVProuClfpXTgEl+IF
+YkfHbeZHEc2tMLMrQ6zWpcUBiSPdKjhEgVWGe6q/lW2KWRsmbx2lCufhtSfAwyCb
+j/+Nt8tlF8+Tmi5SEZ1HbUhSRMdIKHU8epMkeRd7fPXgO/lqzKF1TIi3eO+L63KW
+4zC0O39Uh6ftULWvCvpyxVAhiQGId092CV8CxuqQPY4lXPDtTKcS0pZLtvlAAD3X
+UhdVOszNxL43oEVQyv/Vr5abab4C1ghZQ26KGaWpqDkCAwEAAaNWMFQwMwYDVR0R
+BCwwKoIPZTUub250aGVodWIuY29thhdodHRwczovL2U1Lm9udGhlaHViLmNvbTAd
+BgNVHQ4EFgQUiAUx8mQA/+5rLbZsyk/QgfTIKRgwDQYJKoZIhvcNAQEFBQADggEB
+AFl0fsWKeym+vqb8O7lPxICZpAMcr9hXn0/XA7FzTluuno4/+uRTljBn3rsPFoe5
+gxl+CtDFQnZ/ZKd6PAv6ulbj1w86JXiQ2dVjzPTSHnIzy408NLHiUKj5p7KmtvP6
+VUBknIxbt6krRtkAHWqpA4ykvAW5TyPSk7DFwFI+/lNlcegmMwlk9bVhIB9s6HdI
+K1+Mvw3ek0GCAlo2ucgpEIFXrRwMLLnucXLdWVug9w+ScsmKp19DlnpS2UMmRMfq
+eWPEpGoM/tepFG/JensNMEA41WKCXmmbruIGlh3TWFRE8s0JG3b8jy8aB3mgzq9T
+l8qQhkUldJphTqx2PEHORBM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">e-academy,Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">e-academy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-academy.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Shibboleth Technical Team</md:GivenName>
+    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Shibboleth Administration Team</md:GivenName>
+    <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
new file mode 100644
index 00000000..74b03511
--- /dev/null
+++ b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
+                        EarthServer Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        EarthServer Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
+        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
+        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
+        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
+        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
+        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
+        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+                            j/MCNlE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">EarthServer Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Bruno</md:SurName>
+    <md:EmailAddress>mailto:riccardo.bruno@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
new file mode 100644
index 00000000..5a9d82db
--- /dev/null
+++ b/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T11:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
+                        rizzazione ed il mantenimento del patrimonio culturale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
+        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
+        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
+        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
+        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
+        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
+        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+                            j/MCNlE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">e-Culture Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edev.cesnet.cz.xml b/swamid-interfederations-2.0/edev.cesnet.cz.xml
new file mode 100644
index 00000000..296a0a6e
--- /dev/null
+++ b/swamid-interfederations-2.0/edev.cesnet.cz.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edev.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edev.cesnet.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Edev SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Edev SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNET development service provider</mdui:Description>
+        <mdui:Description xml:lang="cs">CESNET development service provider</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://edev.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">https://edev.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>edev.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
+WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
+A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
+NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
+emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
+FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
+1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
+t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
+yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
+ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
+haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
+Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
+TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
+QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
+Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
+qAMOJmOQterSszZaX0mMz1k7
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>edev.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=edev.cesnet.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDPjCCAiYCCQCOJsi4C7DaXDANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJD
+WjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcTBlByYWd1ZTEPMA0G
+A1UEChMGQ0VTTkVUMRcwFQYDVQQDEw5lZGV2LmNlc25ldC5jejAeFw0xMjEwMTAx
+NzU2NDBaFw0yMjEwMDgxNzU2NDBaMGExCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5D
+emVjaCBSZXB1YmxpYzEPMA0GA1UEBxMGUHJhZ3VlMQ8wDQYDVQQKEwZDRVNORVQx
+FzAVBgNVBAMTDmVkZXYuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqRDUJ+PwMSlE0IyXab2jcgfP2hT+fGUIOll5bOLvccECzS2GNAXO
+1JyZG2RR5XJdLc8j+8ppGU/eU9KznI/hJK4OLJmJRSujQwnXGw8xbgUWTqL96BIM
+t1++U4PxblhqU13SR1JwILkKIld1YpzmYZeUZSU8McGn0MWTNy52kuKMeGTB/bTG
+yCnAIYymnRC+F7S1O5p00gZ8Y8fLAv4cuKA4gkss1PkbpbAEDl3vMFWYVrHSfQ40
+ervXpIR8d+JjBEipdIi1S6+0XLu18bHuhiACBb0Yxvndi6Kf0x3LhebvDA26Ql3N
+haZtUB18QHbJ1QHePbDrK3xKkt/mlBgOQQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQA3rep/ITfO4SeXlbpGUZQS/ez6Yjd9mQah/Wve3gRpp9G4FQRy2iuTCX3pDvne
+Y5WdPUYhSdjbhnbvGmpbO5/QFh/gzWTUlXedmdmN5RJmIRzOHpAhdhQ9cCoKB/xL
+TDrAqxoj+yQuQpjpMdTlhawqjkqee+cn7j8zGbR5HXpVM3cJPAMsRQx19sFWpnGX
+QkpkQ90+gQMK2zAPvIXtZfVTK1F0xlZ6+4NYPuoC3C8xklxfwzNoiktEgtqFPzOB
+Eq3JVPaoY+S7mCigJcJM/YAZFL+/m7SfG70iJt51GF5kfKGNQEK0A7t6+GD9RiKo
+qAMOJmOQterSszZaX0mMz1k7
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edev.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Edev SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Shows available attributes and assertions</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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="email" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">CESNET</OrganizationName>
+    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Novakov</SurName>
+    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie.xml b/swamid-interfederations-2.0/edugate.heanet.ie.xml
new file mode 100644
index 00000000..c1c9be0a
--- /dev/null
+++ b/swamid-interfederations-2.0/edugate.heanet.ie.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
+      <mdui:UIInfo>
+        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
+The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
+RTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCkhF
+QW5ldCBMdGQxEDAOBgNVBAMTB0VkdWdhdGUxITAfBgkqhkiG9w0BCQEWEnN1cHBv
+cnRAZWR1Z2F0ZS5pZTAeFw0xMDAzMDUxMTEwMTdaFw0yMDAzMDIxMTEwMTdaMHkx
+CzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjET
+MBEGA1UEChMKSEVBbmV0IEx0ZDEQMA4GA1UEAxMHRWR1Z2F0ZTEhMB8GCSqGSIb3
+DQEJARYSc3VwcG9ydEBlZHVnYXRlLmllMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA01w+k8x58Sqqs+X0a/vScGc2g4BMBO0KE9lXujcNpXX+fwkzAhLK
+kQuvMtp0sSn7/WrsGa5MNSm5Z6+U3yGV3VCNRlUuiPdPe4zzXaMV3lPGDPNZeSTD
+BMlDXGALtzWBlAriQhctfvjamBRYwXrC0KDFkUCNu6DphR8bjBHhWFx9V20oQ75o
+3wLC7irMa09JkJpc82SVg3PqJ3ogt9Y0BTuqUgoiSGZIoTCsLrkLUotSZOkzxRQq
+u3nVL7cEFEWRmVEkaD3qjq6epo4EHDSUO6HB6WCV5gDccgGb0A5yCIvQY7SjEaaY
+hKmVMixwdki44+hNFPP5Qv+4A5NPxUVlAB8WzdRsrTTc4wDW4XDDAF7+0NmNZECc
+wN9/tLZROATQiFg6Fsmzar39DZos5EUo+4L/ozL8yBXOqdTwrTKKwrWmaQQTDpO6
+ASxGFWyXFbWIoun6/iUSpSgTnjRpgTnGVwFRmMV3bI7jd3egNemNhHZgwQ8js88N
+eQK2Uq3kjNa33NSEjpFNYShR7Tg4d8OUmdCdR3olakF/W6huToc46Skfp783+yqo
+L6qQ5xwL6XCeeB9EFtuGyy/J578W70Y5N0QnlIO14ShfBhMH9DL+wxidVuriJlrM
+mx130sELvNIpPJHf4gXpGAWDhxn2QqMAu1QK0+EueWfZTddglzRrk70CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAgEAhImtRqXMbxZNIog0TgaQvy62DFtbABS0FCM/xMGo
+vuY5l7YF/ot5SNE4MqWYX1pyOQRVIELuvNByH+FLKDmF6jyU9U0c8w9c6Uhf7Zs/
+0lgIfpR8LGvTHiNjbSuy6aCK+0JxGugaZZloSmGkIir9Yi6MQr8HOLdCkRYCISZQ
+pdGJFTwwDEoUDVr0szV4Aupm3wI/MtU80clwrHiVVyY0BoHc63gZ6j3Bn2BiuIb8
+pnxV3nwDnU9pSxkaBAH8Mo6zTo3dM9kdfdXlKvU3VIZ60O/Y8E2FZIKgqUK3enab
+YnX59OpeUExsaEUYRav5CQQlnNoYTOfG5E/foM4ojZhDv8hfeJmnvTjlDvQF4IaC
+WzziDM/1e/mGLjUHShbjv+OaxWBOwQjmPrsqEHTg7iTMTxuHfxnIVnv5/efknDiA
+9QPAVCY5BHH61FMxYfEoIhnLc3qSBGhx1keledDoXRzTyycfZi88Dj2YDBzLCbbT
+KxocVWR5wlAkMpxpFHsLIRp+XYNdc1cG6NQO4eHwoAJ/y1qdGssA9RR9/TEnlKMT
+mUavwgBEqGeMh1w0GwTmXGruoBOZMJNks9WzCmp+3QKsVCjZd/KIxHITq+jNeFRf
+LzMJnF1row2YXqF4AYDluUyCMPo89glxvlX9lDJ3TW5Xz4OJWqrz4WvEyWJIAMZy
+UBY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
+RTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCkhF
+QW5ldCBMdGQxEDAOBgNVBAMTB0VkdWdhdGUxITAfBgkqhkiG9w0BCQEWEnN1cHBv
+cnRAZWR1Z2F0ZS5pZTAeFw0xMDAzMDUxMTEwMTdaFw0yMDAzMDIxMTEwMTdaMHkx
+CzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjET
+MBEGA1UEChMKSEVBbmV0IEx0ZDEQMA4GA1UEAxMHRWR1Z2F0ZTEhMB8GCSqGSIb3
+DQEJARYSc3VwcG9ydEBlZHVnYXRlLmllMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA01w+k8x58Sqqs+X0a/vScGc2g4BMBO0KE9lXujcNpXX+fwkzAhLK
+kQuvMtp0sSn7/WrsGa5MNSm5Z6+U3yGV3VCNRlUuiPdPe4zzXaMV3lPGDPNZeSTD
+BMlDXGALtzWBlAriQhctfvjamBRYwXrC0KDFkUCNu6DphR8bjBHhWFx9V20oQ75o
+3wLC7irMa09JkJpc82SVg3PqJ3ogt9Y0BTuqUgoiSGZIoTCsLrkLUotSZOkzxRQq
+u3nVL7cEFEWRmVEkaD3qjq6epo4EHDSUO6HB6WCV5gDccgGb0A5yCIvQY7SjEaaY
+hKmVMixwdki44+hNFPP5Qv+4A5NPxUVlAB8WzdRsrTTc4wDW4XDDAF7+0NmNZECc
+wN9/tLZROATQiFg6Fsmzar39DZos5EUo+4L/ozL8yBXOqdTwrTKKwrWmaQQTDpO6
+ASxGFWyXFbWIoun6/iUSpSgTnjRpgTnGVwFRmMV3bI7jd3egNemNhHZgwQ8js88N
+eQK2Uq3kjNa33NSEjpFNYShR7Tg4d8OUmdCdR3olakF/W6huToc46Skfp783+yqo
+L6qQ5xwL6XCeeB9EFtuGyy/J578W70Y5N0QnlIO14ShfBhMH9DL+wxidVuriJlrM
+mx130sELvNIpPJHf4gXpGAWDhxn2QqMAu1QK0+EueWfZTddglzRrk70CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAgEAhImtRqXMbxZNIog0TgaQvy62DFtbABS0FCM/xMGo
+vuY5l7YF/ot5SNE4MqWYX1pyOQRVIELuvNByH+FLKDmF6jyU9U0c8w9c6Uhf7Zs/
+0lgIfpR8LGvTHiNjbSuy6aCK+0JxGugaZZloSmGkIir9Yi6MQr8HOLdCkRYCISZQ
+pdGJFTwwDEoUDVr0szV4Aupm3wI/MtU80clwrHiVVyY0BoHc63gZ6j3Bn2BiuIb8
+pnxV3nwDnU9pSxkaBAH8Mo6zTo3dM9kdfdXlKvU3VIZ60O/Y8E2FZIKgqUK3enab
+YnX59OpeUExsaEUYRav5CQQlnNoYTOfG5E/foM4ojZhDv8hfeJmnvTjlDvQF4IaC
+WzziDM/1e/mGLjUHShbjv+OaxWBOwQjmPrsqEHTg7iTMTxuHfxnIVnv5/efknDiA
+9QPAVCY5BHH61FMxYfEoIhnLc3qSBGhx1keledDoXRzTyycfZi88Dj2YDBzLCbbT
+KxocVWR5wlAkMpxpFHsLIRp+XYNdc1cG6NQO4eHwoAJ/y1qdGssA9RR9/TEnlKMT
+mUavwgBEqGeMh1w0GwTmXGruoBOZMJNks9WzCmp+3QKsVCjZd/KIxHITq+jNeFRf
+LzMJnF1row2YXqF4AYDluUyCMPo89glxvlX9lDJ3TW5Xz4OJWqrz4WvEyWJIAMZy
+UBY=
+</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://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Edugate Resource Registry</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
+The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</md:ServiceDescription>
+      <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" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md: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="false"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="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="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md: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="false"/>
+      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="freebusyurl" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md: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:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Glenn</md:GivenName>
+    <md:SurName>Wearen</md:SurName>
+    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>NOC</md:GivenName>
+    <md:SurName>HEAnet</md:SurName>
+    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NOC</md:GivenName>
+    <md:SurName>HEAnet</md:SurName>
+    <md:EmailAddress>noc@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml b/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml
new file mode 100644
index 00000000..e645d46d
--- /dev/null
+++ b/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://egiswamid.egi.kth.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Login" 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://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://egiswamid.egi.kth.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>egiswamid.egi.kth.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=egiswamid.egi.kth.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAOKn91RkenjIMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB4XDTEzMDMwNTExNDU0NFoXDTIzMDMw
+MzExNDU0NFowHzEdMBsGA1UEAxMUZWdpc3dhbWlkLmVnaS5rdGguc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa3DK9UMbKQsvIuJuWLUT3nKRpKUfv
+P0hG4Y9YIjNTXuZWjAVt//FHHVyVVFiyOVjdS7ccgKBdlaQAgxz9TlVXWGkImFDr
+3FB2MBKAXZsqdK8goFzb6QKJJyIS7PRLWQgWWrZkUfESf2HZFbOZK4Q5XxdPu8VY
+DZMU/bwOPwGnO2D8NuJhiMUNSvsw652D0fft5iqoMu68T+RqkvHjt6etgOIRjOUe
+x0FEWmNjOEUXfmR8KEILSgE4LLn4MgBLjwS9f4AklfNaJzubq2CoDDKr5+QqObKa
+s4xt7xB5zaI8n2pWFi1Lik453ZjbyGNNrmIMVoKq8YqfbYbScT+dbGPFAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFGVnaXN3YW1pZC5lZ2kua3RoLnNlMB0GA1UdDgQWBBSe
+YTmnl+7QvxX3lojqwxfovXBD7TANBgkqhkiG9w0BAQUFAAOCAQEAvjYyfsLqwLUA
+l1jw+FSIRQj1ync3bzU0Pw1i79RjYvSMip+TTScKqMlvfCowOaux0zrD9L9Zezbu
+38fVIa/77VZYFRNkt8uzaB5guMvO1O0XJbuCHl7/J9cdsRnhxFFMrGSQEAFKjXS4
+KhnBVBTB618v+Z3Yr3D4A+2ph5GhQreKEyWrEfKUCNLvI2s9IgF3NlnItHT0Z0VL
+PTw0p2GJzoMLwXYaiWVvGMDnJI9hSxIs+cJCtUUb19wCt3p2cILcFRfkHZR7aO1/
+/es1MnuKqzg9hCb7lpizP/bzSTUxfcVYd7rYACatWWZmXTB2INi4BbF8sFrdUYL9
+VESdo2ebFA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://egiswamid.egi.kth.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
new file mode 100644
index 00000000..f6942f97
--- /dev/null
+++ b/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
@@ -0,0 +1,116 @@
+<?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://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ence.ibge.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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://encecafe.ibge.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://encecafe.ibge.gov.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://encecafe.ibge.gov.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">gov.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.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">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</OrganizationName>
+    <OrganizationName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ence.ibge.gov.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Mendonca</SurName>
+    <EmailAddress>mauro.mendonca@ibge.gov.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
new file mode 100644
index 00000000..56d2736a
--- /dev/null
+++ b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
@@ -0,0 +1,105 @@
+<?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">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">JACSoN OpenConext SSO Proxy</mdui:Description>
+        <mdui:Description xml:lang="nl">JACSoN OpenConext SSO Proxy</mdui:Description>
+        <mdui:DisplayName xml:lang="en">JACSoN OpenConext Engine</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nl">JACSoN OpenConext Engine</mdui:DisplayName>
+        <mdui:Logo height="96" width="96">https://static.jacson.jiscadvance.biz/media/conext_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
+						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
+						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
+						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
+						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
+						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
+						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
+						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
+						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
+						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
+						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
+						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
+						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
+						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
+						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
+						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
+						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
+						toH/x3TW0g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
+						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
+						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
+						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
+						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
+						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
+						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
+						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
+						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
+						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
+						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
+						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
+						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
+						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
+						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
+						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
+						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
+						toH/x3TW0g==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.jacson.jiscadvance.biz/authentication/sp/consume-assertion" index="0"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">JACSoN OpenConext Engine</ServiceName>
+      <ServiceName xml:lang="nl">JACSoN OpenConext Engine</ServiceName>
+      <ServiceDescription xml:lang="en">JACSoN OpenConext SSO Proxy</ServiceDescription>
+      <ServiceDescription xml:lang="nl">JACSoN OpenConext SSO Proxy</ServiceDescription>
+      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">JACSoN OpenConext Engine</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Carl</GivenName>
+    <SurName>Vincent</SurName>
+    <EmailAddress>mailto:carl.vincent@newcastle.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Sander</GivenName>
+    <SurName>Van der Waal</SurName>
+    <EmailAddress>mailto:sander.vanderwaal@jiscadvance.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl.xml b/swamid-interfederations-2.0/engine.surfconext.nl.xml
new file mode 100644
index 00000000..6c6bce90
--- /dev/null
+++ b/swamid-interfederations-2.0/engine.surfconext.nl.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.surfconext.nl/authentication/sp/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">SURFconext</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFconext</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die
+                    nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende
+                    aanbieders te combineren.</mdui:Description>
+        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that
+                    creates new opportunities to collaborate online based on a combination of
+                    applications from different providers.</mdui:Description>
+        <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+                        BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+                        VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+                        FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+                        MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+                        B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+                        bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+                        DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+                        AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+                        u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+                        EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+                        D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+                        B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+                        A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+                        6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+                        2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+                        mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+                        8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+                        fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+                        FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+                        3P2Tx32Cq1WXCYkxLaPI </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="nl">SURFconext | SURFnet</md:ServiceName>
+      <md:ServiceName xml:lang="en">SURFconext | SURFnet</md:ServiceName>
+      <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Technical Support</md:SurName>
+    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext</md:GivenName>
+    <md:SurName>Administrative Contact</md:SurName>
+    <md:EmailAddress>surfconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br.xml b/swamid-interfederations-2.0/febe.ufpe.br.xml
new file mode 100644
index 00000000..abda1089
--- /dev/null
+++ b/swamid-interfederations-2.0/febe.ufpe.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://febe.ufpe.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">ufpe.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpe.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpe.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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://febe.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://febe.ufpe.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://febe.ufpe.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://febe.ufpe.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">ufpe.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxETAPBgNVBAoTCFVGUEUvTlRJ
+MREwDwYDVQQLEwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNA
+dWZwZS5icjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQsw
+CQYDVQQGEwJCUjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMB4XDTE0MDIxMDE3NTcx
+NloXDTE5MDIwOTE3NTcxNlowgZQxETAPBgNVBAoTCFVGUEUvTlRJMREwDwYDVQQL
+EwhVRlBFL05USTEiMCAGCSqGSIb3DQEJARYTbHVpei5ub3ZhZXNAdWZwZS5icjEP
+MA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJC
+UjEVMBMGA1UEAxMMZmViZS51ZnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8hMgKxpUf115lxMz4k3SC+wUvqRVy9SuTcFYyi5SUixTxYFsp/DC
+RTCC8OOpgyBJWBovYLRGBXJ9JN/KLopSTZeZHHq8WBDccqW1VH3pK08mIrRN2B8S
+KqOTHAKq1Y/LgplsM5iVpP/72EG9x41jlD2VRFdWmLpmGkHynvggRtkXDE7ORpEY
+KG7FjoLuGWq412vXKN/Amug9QHVWhzB+ks5NoS0n9QiV3RHJJkRYo4E5d1J03PKg
+rWwe5iTx1x7kzYOfcBkTMsYbBXbaBvMr3LfihwbNns2jxuzYLZCRc1f1MnEgB7M3
+3/9AVD2V0xXfP6dbfPgHj9mpjtL9X9mYqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQByr1Cf89bQB/Tb6DGk8fJfZkgC0FBxc7nTuAvZo2hKArY2eX8s6ohlxgocAwqT
+pcc/5MQvWvEgg7nbEfQvCiQ0dcuTGpuqk9FiWlp/sjQ2KFRjH4na9VmxHVnMORSa
+efvuPMN9KMRPQjz7tDsqHNI/ooFFdZNH4odkOi+zsnvIdzz8alZuiQO3pUSeV48Z
+KzaND6lPrBa/+TPf2i9gLtJ0k2WJyrcqLSKbRBTjLzmeKfkDXdj147LM9242/lO8
+mFuuCvO6D4sRNVCkpuJiKX/QfVJKVhSkWcj1dYSlbmTFP5PIo/E+syTLaqoeBv/V
+bNzNXeVqF1LYziLN8/BFb+Rs
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.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">UFPE - Universidade Federal de Pernambuco</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufpe.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Anderson Queiroz</SurName>
+    <EmailAddress>aalqufpe@gmail.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
new file mode 100644
index 00000000..b334a380
--- /dev/null
+++ b/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://federacao.ifpi.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">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifpi.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifpi.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
+VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
+VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
+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==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.ifpi.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://federacao.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.ifpi.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>
+      
+MIIDGDCCAgACAQAwDQYJKoZIhvcNAQEFBQAwUjEMMAoGA1UECxMDRFRJMREwDwYD
+VQQHEwhUZXJlc2luYTEOMAwGA1UECBMFUGlhdWkxCzAJBgNVBAYTAkJSMRIwEAYD
+VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
+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==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.ifpi.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">IFPI - Instituto Federal do Piaui</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifpi.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifpi.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Manuel Goncalves da Silva Neto</SurName>
+    <EmailAddress>manuel@ifpi.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federacao.uvanet.br.xml b/swamid-interfederations-2.0/federacao.uvanet.br.xml
new file mode 100644
index 00000000..32d2d6ac
--- /dev/null
+++ b/swamid-interfederations-2.0/federacao.uvanet.br.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://federacao.uvanet.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uvanet.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uvanet.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uvanet.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
+aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
+IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
+DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
+BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
+cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
+VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
+BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
+BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
+DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
+dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
+QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
+fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
+oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
+n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
+V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
+6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
+WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
+V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
+pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
+mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
+KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
+zPE=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.uvanet.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.uvanet.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uvanet.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
+aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
+IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
+DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
+BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
+cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
+VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
+BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
+BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
+DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
+dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
+QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
+fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
+oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
+n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
+V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
+6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
+WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
+V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
+pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
+mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
+KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
+zPE=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uvanet.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uvanet.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Antonio Kleyson Prado Pereira</SurName>
+    <EmailAddress>kleyson.prado@uvanet.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
new file mode 100644
index 00000000..bd475f3e
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">filesender.cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://filesender.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://filesender.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</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>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
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/filesender.redclara.net.xml b/swamid-interfederations-2.0/filesender.redclara.net.xml
new file mode 100644
index 00000000..4373f63c
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.redclara.net.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.redclara.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</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">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Filesender - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Filesender Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio Filesender de RedCLARA</mdui:Description>
+        <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+</ds:X509Certificate>
+        </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>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
new file mode 100644
index 00000000..9848bbd5
--- /dev/null
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAJ1SDn1K6/XkRV070chIBJswDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMFcxCzAJBgNV
+                            BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
+                            bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
+                            AQUAA4IBDwAwggEKAoIBAQCkR8/1ia78SrXo2BUwW/x7MFZoWhndhTrxa9RN6LLr
+                            RpLYZOZcH6nByQphxTfVOSkDLs3WJeFc2K7gCRqkpqlPTAm9OeE6Wcno6hhNjxY5
+                            NxWHm53FqUT4WF0Gq9XchBduW1xYJqJMHJW9seehiwaBgdhIewpHKyABf02yE3El
+                            nUmcVVJ7lujPxhn+iqts36Zv4cPQlhu1aMsFfep1DPqY3xo/bn4wM6ikKZpyVBZL
+                            4BVQn6WxHdflUXS7jjvkRXccz5Fb002jZP2ciyNDqZrLvc+ykRTaGbfv2+CD+1ik
+                            pCl5eVA8sM9j7OoD2qo0Hwqg72xdcZsXixxR9kItAKhlAgMBAAGjggF/MIIBezAf
+                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU/kRemvBq
+                            DKxXn7Lf1JA5x4cQGEswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+                            VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+                            MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+                            Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+                            dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vy
+                            dml6aXdlYi51bml0by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZI
+                            hvcNAQEFBQADggEBADuNAc7xfGwb6H7Z5InKCocT/KqAD0as8oc7vjzLTIWKbrt/
+                            RZQ7QuFHuE6obQ7AhVUYaqWNqCTzErUvabGAYl8oe0tAPNiKSZ+GxLt4OkNacdE+
+                            FoYBP+DAB8H/BaZhUicXRJDxhxjxrGvqpvUl6BzK5aZEsK+un1ID4lBfb3CFHpQW
+                            4fX5uvhpk6cgXniW7oK6iUypnQisJQZsCXbCnoxVSGt1dvz3HeN1+54uYUyKcmp6
+                            wDTCNv5dHkAAUyiItyHFctIOgWocjGH+LYNfnSZChgF49Tjj0o+j/av6yu26pQvj
+                            BUULpqM3xZG1Zi261ZLtbXQz0AKsk7OnPBSDDI0=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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/forge.switch.ch.xml b/swamid-interfederations-2.0/forge.switch.ch.xml
new file mode 100644
index 00000000..bbf5b688
--- /dev/null
+++ b/swamid-interfederations-2.0/forge.switch.ch.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-06-14T15:40:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Forge: Project Hosting Platform</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIJAMzTQ7ZX7H85MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xMzA2MDYwNjM5MjhaFw0xNjA2MDUwNjM5
+MjhaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMRsrEbfa2dByTHw8nNmWXKluBIqNBddjm2OOssE0dIJ
+PHokGICd3fh9TvoRiB1T5xECoGDM3TmzxlFeS8a+KDSeI58lUj3ZOjjMx8c/S/5U
+yyZYkXNBvTTVXKEWVA+3SEDc92aPeUldK6D4vWwx1EeWqVxO/LoNOi5ZlkPES5qL
+5sXEAl6YFEK6Z65WOEO/KVCdBJfCooWUH3vnl2y/k1u9Iybt2sO/ugXL9ltgmdXF
+o+768lPn1mpME6bvaHaJ5QlDrwXYvCusZD6PBeY8eDyeuXbA3QI9TC2L8Nc/EQgL
+LbFOH7qC1zmW5VwPROrTrKb4XTixuju57lwuoWXTz2cCAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPZm9yZ2Uuc3dpdGNoLmNohiJodHRwczovL2ZvcmdlLnN3aXRjaC5jaC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRInInngJvjyAHf4YVeGVTNbhSHQjANBgkqhkiG
+9w0BAQUFAAOCAQEAHw9YM3UKHdvpA2bMp1MoB765kRHU58ydqf51ydskOCpeZfv8
+pTw+kbvEsE1c2RbjcQ6oB5KXh5qA/jB8Ig/Ur/lN9ben25w70rcNJmt6bxbXKXVn
+BDg+G/oxuX8JS7BTlt9oz7UKuQYA7jcdmai1TgLe/ITzX4ieEWcErlf3CR4QLo6v
+LcIY8wseU5bZaSoQLD3O1sTGsRa68TO8RgJw2REWVPbt/wDRHQut2n/+P/3dam5i
+d3GxkhfzcE0Wj9lX4dzlC6CqKBdAF8UxXYAf3BDVjheesYf2Ps1iy3KW7XBX0Lci
+D5s3OfoyrsZf5VHSjcxoteZ+NQBmcCgYkgjzXQ==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Forge: Project Hosting Platform</ServiceName>
+      <ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Lukas</GivenName>
+    <SurName>Hämmerle</SurName>
+    <EmailAddress>mailto:lukas.haemmerle@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ghgtool.grnet.gr.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
new file mode 100644
index 00000000..d115131c
--- /dev/null
+++ b/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ghgtool.grnet.gr/shibboleth">
+  <Extensions xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">
+                    http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GHG report tool</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://ghgtool.grnet.gr/about/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://ghgtool.grnet.gr/about/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://ghgtool.grnet.gr/about/privacy#greek</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="250" xml:lang="en">https://ghgtool.grnet.gr/about/ghgtoollogo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://ghgtool.grnet.gr/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://ghgtool.grnet.gr/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFwTCCA6mgAwIBAgIJAMzPE0+nt+YbMA0GCSqGSIb3DQEBBQUAMEkxCzAJBgNV
+                            BAYTAkdSMQ4wDAYDVQQIEwVQQVRSQTEMMAoGA1UEBxMDUklPMQ4wDAYDVQQKEwVH
+                            Uk5FVDEMMAoGA1UECxMDUlU2MB4XDTEzMTExMjAxMjI1NloXDTE0MTExMjAxMjI1
+                            NlowSTELMAkGA1UEBhMCR1IxDjAMBgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8x
+                            DjAMBgNVBAoTBUdSTkVUMQwwCgYDVQQLEwNSVTYwggIiMA0GCSqGSIb3DQEBAQUA
+                            A4ICDwAwggIKAoICAQDCNiDRCIEqgOS4RtYPP04QBw632zSJ9tklRo5VcnzrneYH
+                            r2APRVeUQO4uPUMeJEs3a/MQkh8C/zWctIrTWyJh/RVO77uXhxYFQyptNx3hhg3Y
+                            GABTxJ5Jv6Jkzznhr2+Rq/ayEKLuIxQDt5aG3pcBEX9M59LLjIJa1gtT06wYq2Bn
+                            eHBJshDCeEQvC4N7bZLbcCo60Yge7cPfam67Gyrrvr2e7VW/VJJ0hFSvjbh3bGco
+                            TRYRurdtIyjxKRoUvDMFujcbnP1KaHQS5vZlneWcVanu0FWW3ieOYiDPZcZ5yKUq
+                            MGGY3OzWpEOzrOh2Bmgx7zWmcoye+5Rj+1+NvOmkkNqTJs0x+Y0mKY63xfzpHbzj
+                            1iyzSkfoW0sd4V+3ymd951gUkgigJs7WPpkUz5PMt8QmIUH9e+nxBiU2UPA3TTXw
+                            DWs3i40tiGBSkAKLLEz/7wCOgiA733JgkKAbi6TLUFr0VNAQlRZwlyjzD3j8ixis
+                            qBKjnKJ+3uAJ7T3pRNnZCw9s0Qg9Hj6st3u7DmQ9McH3QFgvmS9pWAVKqW95PPtO
+                            MvIASOCdDDnry8yrMG/sUYmbAc8+Nr2+GZR5e14ZmMaN2ImM7xDdLEUdE9jFqInv
+                            fErEbIu+00EVYYijNmIamywaCrSr09LlXXC6/1vPlZdiGhBcFE/i5KbUeUlwMwID
+                            AQABo4GrMIGoMB0GA1UdDgQWBBTiec00rlpZRRGu2TrFpqW1sjMCRzB5BgNVHSME
+                            cjBwgBTiec00rlpZRRGu2TrFpqW1sjMCR6FNpEswSTELMAkGA1UEBhMCR1IxDjAM
+                            BgNVBAgTBVBBVFJBMQwwCgYDVQQHEwNSSU8xDjAMBgNVBAoTBUdSTkVUMQwwCgYD
+                            VQQLEwNSVTaCCQDMzxNPp7fmGzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+                            A4ICAQA7Ii3a/ZLBsRavzMBp54dnbC66oSiIPylHo2Xkc413uHVrMJEnroT/o1jk
+                            RKq90Mvqr2sGfTpYjz6fGX3A+LHUOW2XYnqQCTILMcJgvSnqXW3Fxcd00ogSdZWx
+                            0KS5VVNCZ5mPEgsQwr+BtOKdB2sb8PGhWYKnVSKYLCrt4FjX7gJBYLpqUGWxMyoq
+                            fWg2ovutdRW/izFIGuEEW1031+HZ+9f66AMexswnAIUhEeF6Ew14saA2f23Rvoyl
+                            4rFqQ0wbXsnOy+PeS9bnF6QLCEXMVlEkJg+MNPkESPY6Lns98ExIP0gh9rcOSR97
+                            4KHhgFsJMWG6PfcQ328wjeMtQF9ZqThhtb+//5eODBtIZZvZjZfcICh6lEHiwh2a
+                            8pX39iau26q7Oy5WtMXf8lLFS/ECfmc1WLfZZlh9C/cjHRkrFLwqyCiwpQ/QfGFZ
+                            HgfCEKwvZ7gS7UuiT7Aa6gGy8IXwZFC4gwtcQ5n7Fo35K6WBeA9tJ+n2GWwDF/5M
+                            tkmYhp5t+sCXM4ygUfHnvwLvxkLN2yUzFZCpPsoaQwbWOhvmAsvaz4c9ZMlySGia
+                            hr0y8arTsb1cPFQvcM/1xvjWw8nlx3OaoHV4hV3K+B2e+heYkP11DLoY5ZiG2Dh/
+                            eMqY26cZtNFIW4tgT7/uLpwzbeTrVDCG/PuoSyYicbEMLQ+hDA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="0" isDefault="true">
+      <ServiceName xml:lang="en">GHG report tool</ServiceName>
+      <ServiceDescription xml:lang="en">GHG online reporting tool</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:schac:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Vasiliki Giannikopoulou</GivenName>
+    <EmailAddress>vasilg@admin.grnet.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Constantinos Vassilakis</GivenName>
+    <EmailAddress>cvassilakis@admin.grnet.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gidp.geant.net.xml b/swamid-interfederations-2.0/gidp.geant.net.xml
new file mode 100644
index 00000000..7eb2b294
--- /dev/null
+++ b/swamid-interfederations-2.0/gidp.geant.net.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.geant.net/sp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</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>MIIFUzCCBDugAwIBAgIRAOipFX0RJIRenc077AEf/TMwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDEyMjIwMDAwMDBaFw0xMzEyMjEyMzU5NTlaMIHwMRswGQYDVQQDExJ3d3cuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDIuZ2lkcC5nZWFudC5uZXQxHDAaBgNVBAMTE2lkcDEuZ2lkcC5nZWFudC5uZXQxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMUIwQAYDVQQKEzlEZWxpdmVyeSBvZiBBZHZhbmNlZCBOZXR3b3JrIFRlY2hub2xvZ3kgdG8gRXVyb3BlIExpbWl0ZWQxFzAVBgNVBAMTDmdpZHAuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxshl/HoJhaoNUgaZ8HTIexsHKN2r7Lee0f+k04Jxnmo6o5OauxOpM0991B1xt+5FyXobgNjQSIcKKEvLwaTH7HYYI9bWvfHfVXaYzPOLySPKo+c3Tldbfq0NUXo18ZWuRadEaY+waChcnlkP7yq3ZPxva4aWUvA4iCqpjbZGpMYoJvWhrHua982mBOq29j2+1VwRpBFaverOb2f4jenhlnxstvF6KUSm6B6Y1XUfwJMjAEXxXdai7RodznXV8pCoJMGyn2GN7ClGCq6qHqtSerxdymGHNVpR7pXZ1tF/mI7JIsF+NFErmZJcW79pl7m5ZoZNR+SIDexdg1/IydduGwIDAQABo4IBnzCCAZswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFArEHsfdZvlpOxPguP9/En90/NMgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMFcGA1UdEQRQME6CDmdpZHAuZ2VhbnQubmV0ghNpZHAxLmdpZHAuZ2VhbnQubmV0ghNpZHAyLmdpZHAuZ2VhbnQubmV0ghJ3d3cuZ2lkcC5nZWFudC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAH56nltzImiMVOv5DJxcTo2cpGBWPO+OI7S1Ns76cS6PzWbkm/zjPPZI871Pfgw6n3Q3V3Kpc48hRyx3WPH/9nk+YnFEUjkjaRCzeWR6A2oYSb83iI2n/33+E2AmyZ1FX5E1nfxRtSBLYyHPdXYQ6A/TN4qtm/9QHrbcISPEQJwvJn4/BOQDrvsjZDJeq7Srrr2An//RpNdC9cA4wU+m0oJPbPHGl32ENO6JVK7gJPYw2WBDER1SMwAEThtUthQyZhp1z6jA/hoeHfM4QR2/mT458LpRXs1c5VGAeC+4pjfJ4skXAU17Nq+ut8+fJMjjQSXOpv10kS2jNq2XfPmN+K4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gidp.geant.net/sp/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://gidp.geant.net/sp/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://gidp.geant.net/sp/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://gidp.geant.net/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">GEANT SP Proxy</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GEANT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GEANT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>edugain-ot@geant.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
new file mode 100644
index 00000000..8337d484
--- /dev/null
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T17:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service provides information for Grid users, Application developers and
+                        Grid site administrators. It is mainly devoted to the people involved in the
+                        GISELA project but many pages are of general interest
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
+                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
+                        GISELA ma molte informazioni sono di interesse generale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
+                    Grid site administrators. It is mainly devoted to the people involved in the
+                    GISELA project but many pages are of general interest
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GISELA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">GISELA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Diego</md:GivenName>
+    <md:SurName>Scardaci</md:SurName>
+    <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
new file mode 100644
index 00000000..d2e39a60
--- /dev/null
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
+  <Extensions>
+    <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 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:InformationURL xml:lang="en">http://www.noc.grnet.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
+                            8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr: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://gn-vho.grnet.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gn-vho.grnet.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 regexp="false">gn-vho.grnet.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDHDCCAgSgAwIBAgIJAJMOS4lZGZTGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+                            BAMTD2duLXZoby5ncm5ldC5ncjAeFw0xNDAzMDcxODI1MzNaFw0xOTAzMDYxODI1
+                            MzNaMBoxGDAWBgNVBAMTD2duLXZoby5ncm5ldC5ncjCCASIwDQYJKoZIhvcNAQEB
+                            BQADggEPADCCAQoCggEBAOh9S7NB2MuQqUBKOiEe05XHFCBBc9e6icfod97VFeug
+                            hdLsAZK/hpPAADzXQsKz2eHG3abRgxWUneQ7e8hSPCckGRG06FtbSI4zOitlx9id
+                            QHk1ah1vaVFLKiFdFhpqsE8Gjbb7FfA4cwXjMO4l8D4m3kFkKQk5x0Ok5EIumDlx
+                            RHPSRxIS6RsGE9y/xvCu+NNvc8zG6eSXrNLPgLHau3aNPY/NeYaV9UZg6pV8PlS4
+                            DbNLIg6U+rbYMBztRzfkHL5UTuykGwmECgKP7E/cajAS3siR6c7avkeMaqmdyCSt
+                            GB0JofKDSWEC+rIIMUafxM2JMpcmqDSe1a7gRij/Gk0CAwEAAaNlMGMwQgYDVR0R
+                            BDswOYIPZ24tdmhvLmdybmV0LmdyhiZodHRwczovL2duLXZoby5ncm5ldC5nci9p
+                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbS3VHThd6Vyhy9/Pki68p/j4ZRYwDQYJ
+                            KoZIhvcNAQEFBQADggEBAOMWzzekuxdAwdr8DY8tM6tCKjq/YRP70b9eKH3zwXWc
+                            XZZwcv57B7z1wwt/4eCLQai4bPIIAGnFJIr+LRV2hhy3HJZ/CtFs5LqYFP/OCaLa
+                            VbwyzBQMRwAy5Jbt7ikfc7P7BOPjQ1zQzTxkNUmWGXoTIkPJ4naSmNUV26WWSvA9
+                            15ZjygTLXMVwuOAFXhuBBU5AWfzfQa6nxlFUQ4NYw7ow4h73KWrVRRpXTV7U4g3s
+                            ytc1mR50M3dyL1uT7lpfSyTJ8fdzjSuw0xknlCY2rmOGq9RVPZwoz8ZP2xrVdcNW
+                            8Y/HvCvcXUMu/2w1Xei++WItO1eyS80x8+/VjQ7h+50=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr: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">Greek Research and Technology Network</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</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>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Greek Research and Technology Network</Company>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
new file mode 100644
index 00000000..91b9b491
--- /dev/null
+++ b/swamid-interfederations-2.0/gteavirtual.org.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gteavirtual.org">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-02-20T15:43:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
+							6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</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>MIIFyjCCA7ICCQCkUnPQ/PtKmzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wHhcNMTExMTE5MjMwNTAxWhcNMTYxMTE3MjMwNTAxWjCBpjELMAkGA1UEBhMCRVMxEjAQBgNVBAgMCUVzcGHDg8KxYTEPMA0GA1UEBwwGTWFsYWdhMSAwHgYDVQQKDBdVbml2ZXJzaWRhZCBkZSBNw4NhbGFnYTENMAsGA1UECwwER1RFQTEYMBYGA1UEAwwPZ3RlYXZpcnR1YWwub3JnMScwJQYJKoZIhvcNAQkBFhhkYW5pZWxjZWJyaWFuckBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFUagwJ9IvqMmMGKHFQ3XmAr6G7B0suWqbHPMWBfIlyu6cm0NWhH1JsiDxEhUxljmk+B4FZOWI9YcNo1YB1pO8wYJTeviqzrQDNjqURUOsyfYdQn3L2k4f9exQT25cmXhu0h8zybslGQDKWZZPH/S/jMpShPjIlrRx/ARrEbH/CgLHviS1oVKi/IkwZ55Gwd5/ikvUaQL+cmPsVPIzMrKgxGJk37RmFgRKYMvjqsMF8IKzOJRMxm342aJNP7Tka/C4p4E+nmFcqN5ak4rljqpjucjwGGNpKiZ4XZN/7ItpI2Lcj8tmW6UZx6/55r99OjwrmnkLd6bLWnHsavMnABkdp54st5uplhEfkSV9rP67k5MOpGSQFZGFyvSteMUc8atiZjaeZQ8YOugC8HMB/zIg7TGx5/pqHJjYNxYmHp0EkEmw8ahGOS0dsFWxzlHP36OvhSXQ5OQxj9iQLIF2j56RHYfedcJjkb5KbnBanfNVWgOZnPtmsYFy6d1hjWsnvLPd5B1Jt2F+zAsQlFIkJ9jJOWd7+QpeeUi8AC1XMTjHkDnlkEROvk5JQYYNG+CHY9brTH/vCmT7gLHF6pOEBdjtLhoK7G8oB2Flmq7vZUyFbRMSjBvBiBwZZLdMtn1Zj9tEWmWHgcYcVyPN4QeIcjJI63le4UP4RkJKgRZBbspEZwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQCVOFINDie1oi7tXIXnvc43aZMxgjojUp0JCkVMpNsbF34X1C09FA5CiIngISYtP4FF7tbMjq08FnbjOUUEzYqhjAWKXCRipEOAED1todVlu14AL4P66HLWXUq5pahuYKwzSs+f7Km3d2Ttfv0GeYHfHEhIc4xOTiEEQ2J2zZpdJaDgRxRVTGIC4GAAh13EGd2DZQi87tK5dxQ4Lrrae/ko+7JxWmHY24emCRQNB97huD4IHMXDU9geiBf4PVwueI7/FSPAiyCanCc5GpZdZMW3JBegsfNi64lm5MjGLhp2pD3dKq33lG4IoDt4kT9ta6TDk/JLLxNIkAAliGMT8qPZlVQMTqkMchKz4NaUZTz0K6cobkSYpo5OLdfT4ukcN/rIup4/ha0kXX7sj7sgDuUV7EtLkUJyNIZOdjphaBRdxyPjXLrrmpaBCyWZxz4CZCu4xhsV8LJvFnfC5nb+r13WpZLN2Mdv74z8LPZ6hxtCaVVgcnlWaO1SslpagDVE2t0s0PpJWivf9+wssIOK5fRyagTAdzSk+nDI0vPxcgnMsim4FfXaragepZomc6jOCELFJFCZ/qdoCbdfndxiKFtyO5vsfnt0+f29C6NJc4GDRdzaKFKY14uXxaK/H6EEqfHKDGdDY8nOi
+							6jCaLPUFw5hY05y5AyqNgwDK26yXPJlcQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gteavirtual.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">GTEA - University of Malaga</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">GTEA - Universidad de Málaga</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">GTEA tools</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Herramientas GTEA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://gtea.uma.es/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://gtea.uma.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Daniel</md:GivenName>
+    <md:SurName>Cebrián Robles</md:SurName>
+    <md:EmailAddress>danielcebrianr@gmail.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it.xml b/swamid-interfederations-2.0/gw.ct.infn.it.xml
new file mode 100644
index 00000000..62e2b921
--- /dev/null
+++ b/swamid-interfederations-2.0/gw.ct.infn.it.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-02T17:20:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
new file mode 100644
index 00000000..235d4d14
--- /dev/null
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-23T09:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>halfback.cnaf.infn.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=halfback.cnaf.infn.it,O=Istituto Nazionale di Fisica Nucleare,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
+                            BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
+                            bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
+                            DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
+                            p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
+                            KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
+                            Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
+                            hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
+                            ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
+                            kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
+                            ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
+                            D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
+                            7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
+                            EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
+                            icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
+                            +6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
+                            yVxNpwv+OOJLtns=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se.xml
new file mode 100644
index 00000000..3269a664
--- /dev/null
+++ b/swamid-interfederations-2.0/hbidp.hb.se.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hbidp.hb.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Borås</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Borås</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Borås.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Borås University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.hb.se/Om-hogskolan/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.hb.se/en/About-UB/</mdui:InformationURL>
+        <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+        <mdui:Logo height="90" width="350" xml:lang="sv">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hb.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.171.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.172.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.173.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.174.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.175.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.245.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.246.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.247.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.64.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.65.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.66.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.67.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.68.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.69.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.70.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
+BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
+MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
+tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
++KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
+dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
+DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
+2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
+Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
+dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
+ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
+t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
+J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
+rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
+NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
+9Ks=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hb.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEfjCCA2agAwIBAgIQQh0tAUo8tbGvjLhvMULUFjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTAwMTAwMDAwMFoXDTEyMDkzMDIzNTk1OVowTjELMAkGA1UE
+BhMCU0UxHDAaBgNVBAoME0jDtmdza29sYW4gaSBCb3LDpXMxCzAJBgNVBAsTAklU
+MRQwEgYDVQQDEwtoYmlkcC5oYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANmhPsWXpER8PlBGqHtoR1hsTeLWqTRGhaFm9Vuc57qf7xd328jkwZ3C
+tyBL65rNHYI/EVrsiA5nNAm/NLuPl5Wh8IOztI26XcHgNhYgqe6Tlpw5kN4pn0ME
++KAMAGKh1PAaKP2E3sHN2k3QdqHU0hesmaFHRAm+9JqcP++Frkdr1WVIcxYniOBa
+dorbeA+Mui3WaMsUm/tkYTOOQ3QCHi2VT9U6JOIVyuyIjX6slHhS2LkCSAKn4sKD
+DUVaeSyTxWrH12Dx/mMd8BfXV8XkjBbDNzfFizxTzHsdrj8K8y9ggGiv5+g1Mmsf
+2ehMfEhN0TNtVLaiw9Br2N7XSLLGuaMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaA
+FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRNDaiYtvTh/NO79ufN3n7k
+Zx6CjjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdggtoYmlkcC5oYi5zZYIO
+dm0taGJpZHAuaGIuc2UwDQYJKoZIhvcNAQEFBQADggEBACUT4mjeYXLYfWz4oKhH
+ou/S52jlhiVtskXArO7Ntxk0Oy6tpSkRYgyBN4NDuaFfS//69Et4kQWfxpe7tS8X
+t2cEEtTRhYhwBpBHCMnixRxcoYyeH60fnHoeCn+w7HmD+ffyRojbtcE86O+7bRTP
+J2xZfZxoRzyEYBVfLBEcBSOYTQrlIBtZmZS/w4whSQs5ruf5X9Wj7BrFLjo8nnli
+rA6Msf8vaeuR1RNKQFHIx/vX3Aj+s2E4rq+L9O3BDAyfc1vKiNy8LLhlvYUFl9If
+NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
+9Ks=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">HB</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Borås</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Borås</Company>
+    <SurName>Per-Olof Axelsson</SurName>
+    <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4697</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Borås</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+    <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
new file mode 100644
index 00000000..64b36ac8
--- /dev/null
+++ b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://homeproj.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://homeproj.cesnet.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">homeproj.cesnet.cz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">homeproj.cesnet.cz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs repository and colaboration server.</mdui:Description>
+        <mdui:Description xml:lang="cs">CESNETi repozitar a kolaborativni server.</mdui:Description>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
+BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
+dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
+46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
+sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
+zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
+saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
+Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
+YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
+BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
+Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
+S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
+SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
+nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
+K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>homeproj-ng.cesnet.cz</ds:KeyName>
+        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
+YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
+ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
+rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
+1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
+CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
+ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
+idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
+a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
+/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
+mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
+UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
+BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
+dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
+46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
+sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
+zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
+saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
+Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
+YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
+BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
+Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
+S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
+SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
+nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
+K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>homeproj-ng.cesnet.cz</ds:KeyName>
+        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
+YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
+ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
+rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
+1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
+CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
+ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
+idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
+a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
+/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
+mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
+UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">CESNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">CESNET</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Jan</GivenName>
+    <SurName>Mach</SurName>
+    <EmailAddress>jan.mach@cesnet.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Jan</GivenName>
+    <SurName>Ruzicka</SurName>
+    <EmailAddress>janru@cesnet.cz</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
new file mode 100644
index 00000000..123d41e3
--- /dev/null
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk.xml
@@ -0,0 +1,84 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <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://iam.cf.ac.uk/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDDzCCAfegAwIBAgIJAMuQ3vgWPWjiMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+						BAMTDGlhbS5jZi5hYy51azAeFw0xMzAyMTUxMDM1MjBaFw0zMzAyMTAxMDM1MjBa
+						MBcxFTATBgNVBAMTDGlhbS5jZi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBAL6J4304XtLySk3GhICIZf9SWzmwHwtlUDhA+pH+03WiCv6ZWOJl
+						piGglBiTyYB6aOPRSsz89pzGBUoUgApTH4zGvD6tkFrzQsX7QCWmi48UnkrsgSw7
+						bTvwMP6EQOgR/cJH3lftaQGlspt2+CxGj8+inSKdzA5/v24GLWUKrLSI7+vk9z3P
+						HIEVY0mxRWZIomtb9Z3vCaSdESR0fR6egsT6pbRl9X7EdQJVwQmKC0PzL260cBmk
+						JmckbSpY1POebUgOXF2CzJup6tTSiIJrN9ppKY4aLKSNIoQPxEF2Zzl7Lsx5HffV
+						De6GIYKjgp9y0CTsIn4xYdHhlAmUUbV4y/ECAwEAAaNeMFwwOwYDVR0RBDQwMoIM
+						aWFtLmNmLmFjLnVrhiJodHRwczovL2lhbS5jZi5hYy51ay9zcC9zaGliYm9sZXRo
+						MB0GA1UdDgQWBBRpauq5kzBefcX+Qm3CixEbP3/3RDANBgkqhkiG9w0BAQUFAAOC
+						AQEAkrz51AVE6XZK3fq+CX/g+xC58we4jFRkGVA9dmcIpKJsSJMsEaeo78GPFKLq
+						gYiy7pHHqSGFXc+8ySrN5kex7bGqERg1qldhQ2CkVEEV6sVd5X1LOnc9D9uJrl9n
+						jDOiI//2rGM+hR5xCFQ04hVlpgxN+yHwvK/idqxiV2HpoynB2MadfarxAPGEOe+i
+						wmv/9U74Jjd93zhGfQNEfTOXTP/h/dt6v86cJ9Z4DkAtOUnVA6bLi08ANaJDBBgp
+						COS3qN36Vz4ifhyel26f9yBxKvPZaJtwoSBEJHntaS5nbC301TYIRohm2hsmFMnE
+						VwKYG1nWV+7ql4LLn3dcdr+5sw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iam.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Cardiff University IAM Team's Site</ServiceName>
+      <ServiceDescription xml:lang="en">
+				This is the website of the Identity and Access Management team at Cardiff University, including the trac for RAPTOR and WUGEN.
+			</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University: IAM@Cardiff's Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://iam.cf.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>INSRV Connect</GivenName>
+    <EmailAddress>mailto:insrvConnect@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.vse.cz.xml b/swamid-interfederations-2.0/id.vse.cz.xml
new file mode 100644
index 00000000..8ff19cab
--- /dev/null
+++ b/swamid-interfederations-2.0/id.vse.cz.xml
@@ -0,0 +1,134 @@
+<?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://id.vse.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">vse.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The University of Economics, Prague </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Economics in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy ekonomické v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vse.cz/english/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vse.cz/</mdui:InformationURL>
+        <mdui:Logo height="132" width="132">https://www2.eduid.cz/idp-loga/vse.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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>
+MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
+BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
+YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
+07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
+tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
+oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
+hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
+Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
+whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
+n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
+f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
+ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
+nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
+aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
+MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
+SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
+3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
+NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
+xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
+lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
+iiF7bmvAPKF6y23wHA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.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>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.vse.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.vse.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.vse.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.vse.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">vse.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
+BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
+YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
+07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
+tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
+oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
+hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
+Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
+whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
+n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
+f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
+ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
+nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
+aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
+MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
+SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
+3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
+NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
+xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
+lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
+iiF7bmvAPKF6y23wHA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.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>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="cs">Vysoká škola ekonomická v Praze</OrganizationName>
+    <OrganizationName xml:lang="en">University of Economics, Prague</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Economics, Prague</OrganizationDisplayName>
+    <OrganizationURL xml:lang="cs">http://www.vse.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.vse.cz/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>František</GivenName>
+    <SurName>Kučera</SurName>
+    <EmailAddress>frantisek.kucera@vse.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it.xml b/swamid-interfederations-2.0/idem.ced.inaf.it.xml
new file mode 100644
index 00000000..7a0370b0
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idem.ced.inaf.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-03-18T15:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">inaf.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">National Institute for Astrophysics - INAF</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:DisplayName>
+        <mdui:Description xml:lang="en">National Institute for Astrophysics - INAF</mdui:Description>
+        <mdui:Description xml:lang="it">Istituto Nazionale di Astrofisica - INAF</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://www.ced.inaf.it/idem-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.ced.inaf.it/idem-info/idp-privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="60" xml:lang="it">https://idem.ced.inaf.it/LogoINAF60.png</mdui:Logo>
+        <mdui:Logo height="100" width="100" xml:lang="it">https://idem.ced.inaf.it/LogoINAF100.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw= </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">inaf.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">ira.inaf.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">iasfbo.inaf.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw= </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Istituto Nazionale di Astrofisica (INAF)</OrganizationName>
+    <OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">https://www.inaf.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.inaf.it/en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Mauro</GivenName>
+    <SurName>Nanni</SurName>
+    <EmailAddress>m.nanni@ira.inaf.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Franco</GivenName>
+    <SurName>Tinarelli</SurName>
+    <EmailAddress>f.tinarelli@ira.inaf.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <EmailAddress>inaf-idem@ced.inaf.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it.xml b/swamid-interfederations-2.0/idemfero.units.it.xml
new file mode 100644
index 00000000..e471f5b5
--- /dev/null
+++ b/swamid-interfederations-2.0/idemfero.units.it.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-09T08:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.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">units.it</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Trieste AA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Trieste AA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Authority for University of Trieste members</mdui:Description>
+        <mdui:Description xml:lang="it">Attribute Authority per gli utenti dell'Università di Trieste</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università degli Studi di Trieste</OrganizationName>
+    <OrganizationName xml:lang="en">University of Trieste</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Trieste</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Trieste</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.units.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://international.units.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Staff Tecnico</GivenName>
+    <EmailAddress>idem@units.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.mdh.se.xml b/swamid-interfederations-2.0/identity.mdh.se.xml
new file mode 100644
index 00000000..88e51c09
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.mdh.se.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.mdh.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Mälardalens Högskola</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Mälardalen University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens högskola.</mdui:Description>
+        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Logo height="216" width="117">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>mdh.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
+Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
+z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
+SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
+ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
+F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
+uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
+aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
+PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
+Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
+b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
+P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
+7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
+0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdh.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAIPxTFqNFghYnsNGOQDHDvRnU53tMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTAeFw0wOTA5MDIxMzE5MDRa
+Fw0yOTA5MDIxMzE5MDRaMBoxGDAWBgNVBAMTD2lkZW50aXR5Lm1kaC5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBpGX8JJ+RvjMMMD3q/j01q58p8
+z0R9tuklMD5smW+Tz0JgiG3KDnynWvcYyg3s9DevNRUMmsQqzDBko771ecyhqkHy
+SoCkfVNJ9k7RaQmoaglSGZlR5N9lgcysHNA8qVqJYpUpsSFuQckr1dzS3RjngcTM
+ICcuBjy/JviV8fKzYzF0v7F9HW+BEuJXHH6lhqhDIuI4R4n7I9/lYYxJWvQZVelJ
+F6/Z+RnbqaSzViq1qcMe5AWcnZgC85i0KiIcnaKiImNRJbVrVUN+eniQSj9ROJyf
+uk7Ldhpg8gvqsaUVd2drDY43XymAu7XFVnBBX340JKgb7F8wxpvIK6Gh6ZMCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRlbnRpdHkubWRoLnNlhiZodHRwczovL2lkZW50
+aXR5Lm1kaC5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/qdjANz6BbQi/0eQ
+PgsaI1I0V4MwDQYJKoZIhvcNAQEFBQADggEBAG3OEKV7S8aojN/D7UOqURiCRrjC
+Dk6wEnMLX6uIYAFCv6jc5QdkMWaaDBR0tgGhmgzRZOGnl9pvzT1AjMIhvMu2/luI
+b2oawOhycFG1rECJCpDi+gLDGhxzbQY/E9VIz+AcBAxglBFbDqqIynhFs+GZn+fv
+P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
+7UwSK+MqY42FI27aHfIMAN7ccEun9HViAHU9HT/tng0kSydoF9VOvTI657LX7vpb
+0hhoH3UMUkrHgTwtNYpylgL6YEy/GtQHimQGN/O6aAQt1ZIyXKnuQufcnNk=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">MDH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Mälardalen University</Company>
+    <EmailAddress>peter.falck@mdh.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
new file mode 100644
index 00000000..dca95568
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-cafe.ifrr.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFRR - Instituto Federal de Roraima</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifrr.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifrr.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
+Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
+AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
+MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
+IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
+LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
+B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
+zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
+zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
+uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
+B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
+TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
+AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
+TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
+QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
+GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
+zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
+ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
+Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
+AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
+MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
+IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
+LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
+B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
+dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
+zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
+zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
+uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
+B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
+TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
+AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
+TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
+QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
+GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
+zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
+ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFRR - Instituto Federal de Roraima</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifrr.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifrr.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Francisco Cavalcante Filho</SurName>
+    <EmailAddress>francisco.filho@ifrr.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br.xml b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
new file mode 100644
index 00000000..5eea4cbb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-cafe.unir.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">unir.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIR - Universidade Federal de Rondonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unir.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unir.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
+DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
+EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
+YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
+VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
+EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
+GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
+ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
+ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
+Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
+fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
+P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
+XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
+PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
+m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
+HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
+1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
+V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
+m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
+YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
+9y9IHg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.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">unir.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
+RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
+DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
+EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
+YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
+VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
+EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
+GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
+ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
+ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
+Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
+fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
+P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
+XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
+PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
+m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
+HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
+1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
+V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
+m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
+YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
+9y9IHg==
+
+                  
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.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">UNIR - Universidade Federal de Rondonia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unir.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unir.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Fabio Leite Dias</SurName>
+    <EmailAddress>fabioleite@unir.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
new file mode 100644
index 00000000..fd2c2a23
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.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://idp-css.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
new file mode 100644
index 00000000..6139f822
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
@@ -0,0 +1,101 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University (Test - Dev)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
+						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
+						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
+						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
+						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
+						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
+						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
+						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
+						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
+						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
+						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
+						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
+						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
+						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dev.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk/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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDLDCCAhSgAwIBAgIVALNT+AdUt2+81m3rncPOX7CvBavdMA0GCSqGSIb3DQEB
+						BQUAMBsxGTAXBgNVBAMTEGlkcC1kZXYuY2YuYWMudWswHhcNMTEwNjEwMTYzNjE1
+						WhcNMzEwNjEwMTYzNjE1WjAbMRkwFwYDVQQDExBpZHAtZGV2LmNmLmFjLnVrMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHK/62C9csv4UEWcGy5lo97k
+						7zXUCDf1wW5k83sn9BzqG4YJoM9G9pefXU2AHFZtEhZjgxQgbOUdG9MdOHmeeuXr
+						8/izvK6BOyFmNFgBi/h2uwjI1T86WHMJG91IQFUTWbRlDm43zAoigsscOYDJ8+Fk
+						6KZWDAngo5Ip0NlwUcKGqjdZbHeWyuLITCwgqU1aQHEg2eLzT+eC2/c+sbTy6GqO
+						5wsTLZGNNSifEPo2JzMi9WvdyklXcHj1X5cVExixeQ9cgb6VeqS6NtKRgG7PvZZU
+						REdZZAQ3yMWZeqOoWyhOteUcnlZQo3yWytLXy7vsVpMZWG6dXw90XTVuLwObTQID
+						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAtZGV2LmNmLmFjLnVrhidodHRwczovL2lk
+						cC1kZXYuY2YuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMJ9mnoUnJdL
+						2PYWanl07bVy1yRbMA0GCSqGSIb3DQEBBQUAA4IBAQA0vIW7kIcy6RA+OkshiraI
+						9D8m8H3Q5ye4QgbqdiLAaMy2/pHjHKirdseOl+3XLyrzDelXtl/4DhQCHAbUPssS
+						pgZIVEk4aOVuzjbqKfUOW/Dny9cPYLTVcU/ybhGdMC1FwGikZ499qISPoyJ2zmnC
+						6WH5uvbdmmiBmbvipWBRu6/imITVjzH7hWoz5SMuSFzy68yn5C00t7L9dtI3DgXo
+						zCmMlR+TxITKeAh433Gv+ldwYr4/NRClZBPKtOg4EHun7G7FVjXfEjNYts5aUwfF
+						WlUNTYrQTmfEqypOCvR3sjkLbbv3H/li9NLbE0dCr2DkR0SaOp7mjFqiiXR7z8JT
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Dev)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/insrv/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
new file mode 100644
index 00000000..621a9573
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.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://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
new file mode 100644
index 00000000..348badbd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
@@ -0,0 +1,119 @@
+<?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">
+  <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>
+    </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">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University (Test - Preprod)</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://iam.cf.ac.uk/images/CU-Dev-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://iam.cf.ac.uk/images/CU-Dev-logo-80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
+						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
+						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
+						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
+						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
+						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
+						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
+						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
+						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
+						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
+						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
+						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
+						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
+						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk: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-preprod.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk/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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIErDCCA5SgAwIBAgIRAOYsRgGmDwZDq4ktIsUqyQQwDQYJKoZIhvcNAQEFBQAw
+						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+						IFNTTCBDQTAeFw0xMzAxMTAwMDAwMDBaFw0xNjAxMTAyMzU5NTlaMHgxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEbMBkGA1UEChMSQ2FyZGlmZiBVbml2ZXJz
+						aXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAxMUaWRw
+						LXByZXByb2QuY2YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQDQK7+T3U6Nj6Vc3XKjyiY1fzXA8j1vN91RbPV96DJGnr0vQnls/S5qqY5U8VJi
+						+qzS61+V8TqcpjGUViPYsRnlXISGHnQ7KWccZB2f9lApnJsMhNH6BxCzOYwcLbJw
+						sLbwVoJ11Wxv+O8n3dsO5vr4QSHkXen36WbS1YuVQI9rCri0lzdriB5oy+8J7aQq
+						Gh0azuz7iBc+yFA5RROl7g0cPPXwGpo3p3beWgiVERVdO9Kz5z6sTN306TkT/RKL
+						B5mqHnEN/1GNh8BLJcLPJcYt5CkxJLk+YMiNHs7ssv9QLk7mRzq2OAuQFtbMOlyL
+						TzFBk3EVKcEHYQlWDaSOlQxfAgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNo
+						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVcZWoy8Sj9k5JJOCpW7IY/XjKYIw
+						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcC1wcmVw
+						cm9kLmNmLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBttEXXeJl3ORiixGzvb3bk
+						B1I4hjBX8lQ+U/W7AytyWOsvF8Qzs7mz6an5bakjinYkl5dIRm4eUzTt2KkS8N4a
+						J7dkThSzTAotQ8QgzsrakajH9twHMcccO0Ol5bt/J6dTJ4LhNMc/ULjcApiRjgl/
+						8Fh6kwPdGEkRjN7q3xzcJuKJPbfPOVq5HVINafV65BR+r41DlJ05Cll7WxZZ4+zy
+						QMstqkzxj6/vm9ycaoWoz2ODk/5GFfWq3OMllgLQoFv+4A/sMH6M5UCgRF/CwFm0
+						POJV6rCq1voBGTr2gforlIfCCsWXBl6BpB8mF2lUzzNRAYrez2/QEO8MceHqR4C7
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-preprod.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-preprod.cf.ac.uk: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">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University (Test - Preprod)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
new file mode 100644
index 00000000..0aaf6de9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.ucs.ed.ac.uk/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-30T17:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
+						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
+						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQDCCAiigAwIBAgIVANRDl0zVDHZ6OYfXOdpdFYUK94KWMA0GCSqGSIb3DQEB
+						BQUAMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5lZC5hYy51azAeFw0xMTA4MTcw
+						ODQ4NDRaFw0zMTA4MTcwODQ4NDRaMCAxHjAcBgNVBAMTFWlkcC10ZXN0LnVjcy5l
+						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKk0/tK2QdQr
+						T72QiLa3ntSOTJGlFEGDuwAAnhOXxH6T2+4oqy3QsoUCgI+6f4J8meXYmuCpOIHh
+						BrTv32n9SYgXI+KE40BLSym0ToGzWdz+fZAU+IHaX6gixQRjQdYTPPefDCfeLk3U
+						KTFpHZCK5tMJYiflwS/X7abnOF/yNypoeB3ZpI13qbHV+I5v8iHz6lxs8V2yutXE
+						srjCB+YKVuB5dyVU5ettupnpDQI7vzl3QzHVTm46NoT0MiGS3FH+Xkr/zDXl6ynr
+						Fxkg322Re8D3U1XzQTC/rP4WMqx0cc9Im3JaAf7happqm9fDJqeMdxodKqdgAMDI
+						dH1R1b4lyfUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLXRlc3QudWNzLmVkLmFj
+						LnVrhixodHRwczovL2lkcC10ZXN0LnVjcy5lZC5hYy51ay9pZHAvc2hpYmJvbGV0
+						aDAdBgNVHQ4EFgQUcMIFOHTjJnX/8pzUK1pZ+4jarLQwDQYJKoZIhvcNAQEFBQAD
+						ggEBAI6diGFybO93xeSV7Ww2N8thw3KZrSKou+SASMkCENS81L2Z2f0c9sAmpWZN
+						8Ewi3i7iPcGOvzxD8WQ6sY+roCvgbPJz/CY0NafC1OwJvZwYrv5MBRvWblilkGAr
+						jHp3oD7zQUgx7UsBSOFEnpVlY/JmXmhXYSwIZcSA6ShmyQTo+TRbM206gGCu6R4C
+						dB+g+QtBW0jl56x/wf7d86zb1KGp4f9/UalrP+7RCkQBqkGqZC714/Ib/GURnDSP
+						MJIL1EfWROWJ0aNTNs6IIU35GiQkDotZL4p43FpksZ6KATV6SDVlCF9b5xFvhZpb
+						ZMO08Pnpl7xrrBG2Gw7MPizq7c4=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Edinburgh: V2 TEST</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml
new file mode 100644
index 00000000..2f977757
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-03-15T14:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unito.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Turin (new idp)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Torino</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/notecopyright</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_16x16.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_50x50.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://www.serviziweb.unito.it/_common/images/logoUnito_80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+                            BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+                            MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+                            cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+                            AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+                            KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+                            hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+                            jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+                            hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+                            iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+                            LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+                            ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+                            j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+                            pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+                            5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+                            Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
+                            rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
+                            07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unito.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unito.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+                            BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+                            MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+                            cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+                            AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+                            KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+                            hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+                            jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+                            hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+                            iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+                            LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+                            ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+                            j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+                            pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+                            5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+                            Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
+                            rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
+                            07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università di Torino</OrganizationName>
+    <OrganizationName xml:lang="en">University of Turin</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Torino</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Turin</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Technical Support</SurName>
+    <EmailAddress>portale-supporto@unito.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
new file mode 100644
index 00000000..feb13fb9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aai.arnes.si/idp/20090116">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2009-01-16T14:05:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="sl">http://aai.arnes.si/fed/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.arnes.si/fed/doc/ArnesAAI_general.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">^(.+\.)?arnes\.si$</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Academic and Research Network of Slovenia</mdui:Description>
+        <mdui:Description xml:lang="sl">Akademska in raziskovalna mreža Slovenije</mdui:Description>
+        <mdui:Keywords xml:lang="en">arnes academic arnesaai aai</mdui:Keywords>
+        <mdui:Keywords xml:lang="sl">arnes akademska arnesaai aai</mdui:Keywords>
+        <mdui:Logo height="67" width="64">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABDCAYAAAFb+jPmAAAKRGlDQ1BJQ0MgUHJvZmlsZQAASA2dlndUFNcXx9/MbC+0XZYiZem9twWkLr1IlSYKy+4CS1nWZRewN0QFIoqICFYkKGLAaCgSK6JYCAgW7AEJIkoMRhEVlczGHPX3Oyf5/U7eH3c+8333nnfn3vvOGQAoASECYQ6sAEC2UCKO9PdmxsUnMPG9AAZEgAM2AHC4uaLQKL9ogK5AXzYzF3WS8V8LAuD1LYBaAK5bBIQzmX/p/+9DkSsSSwCAwtEAOx4/l4tyIcpZ+RKRTJ9EmZ6SKWMYI2MxmiDKqjJO+8Tmf/p8Yk8Z87KFPNRHlrOIl82TcRfKG/OkfJSREJSL8gT8fJRvoKyfJc0WoPwGZXo2n5MLAIYi0yV8bjrK1ihTxNGRbJTnAkCgpH3FKV+xhF+A5gkAO0e0RCxIS5cwjbkmTBtnZxYzgJ+fxZdILMI53EyOmMdk52SLOMIlAHz6ZlkUUJLVlokW2dHG2dHRwtYSLf/n9Y+bn73+GWS9/eTxMuLPnkGMni/al9gvWk4tAKwptDZbvmgpOwFoWw+A6t0vmv4+AOQLAWjt++p7GLJ5SZdIRC5WVvn5+ZYCPtdSVtDP6386fPb8e/jqPEvZeZ9rx/Thp3KkWRKmrKjcnKwcqZiZK+Jw+UyL/x7ifx34VVpf5WEeyU/li/lC9KgYdMoEwjS03UKeQCLIETIFwr/r8L8M+yoHGX6aaxRodR8BPckSKPTRAfJrD8DQyABJ3IPuQJ/7FkKMAbKbF6s99mnuUUb3/7T/YeAy9BXOFaQxZTI7MprJlYrzZIzeCZnBAhKQB3SgBrSAHjAGFsAWOAFX4Al8QRAIA9EgHiwCXJAOsoEY5IPlYA0oAiVgC9gOqsFeUAcaQBM4BtrASXAOXARXwTVwE9wDQ2AUPAOT4DWYgSAID1EhGqQGaUMGkBlkC7Egd8gXCoEioXgoGUqDhJAUWg6tg0qgcqga2g81QN9DJ6Bz0GWoH7oDDUPj0O/QOxiBKTAd1oQNYSuYBXvBwXA0vBBOgxfDS+FCeDNcBdfCR+BW+Bx8Fb4JD8HP4CkEIGSEgeggFggLYSNhSAKSioiRlUgxUonUIk1IB9KNXEeGkAnkLQaHoWGYGAuMKyYAMx/DxSzGrMSUYqoxhzCtmC7MdcwwZhLzEUvFamDNsC7YQGwcNg2bjy3CVmLrsS3YC9ib2FHsaxwOx8AZ4ZxwAbh4XAZuGa4UtxvXjDuL68eN4KbweLwa3gzvhg/Dc/ASfBF+J/4I/gx+AD+Kf0MgE7QJtgQ/QgJBSFhLqCQcJpwmDBDGCDNEBaIB0YUYRuQRlxDLiHXEDmIfcZQ4Q1IkGZHcSNGkDNIaUhWpiXSBdJ/0kkwm65KdyRFkAXk1uYp8lHyJPEx+S1GimFLYlESKlLKZcpBylnKH8pJKpRpSPakJVAl1M7WBep76kPpGjiZnKRcox5NbJVcj1yo3IPdcnihvIO8lv0h+qXyl/HH5PvkJBaKCoQJbgaOwUqFG4YTCoMKUIk3RRjFMMVuxVPGw4mXFJ0p4JUMlXyWeUqHSAaXzSiM0hKZHY9O4tHW0OtoF2igdRzeiB9Iz6CX07+i99EllJWV75RjlAuUa5VPKQwyEYcgIZGQxyhjHGLcY71Q0VbxU+CqbVJpUBlSmVeeoeqryVYtVm1Vvqr5TY6r5qmWqbVVrU3ugjlE3VY9Qz1ffo35BfWIOfY7rHO6c4jnH5tzVgDVMNSI1lmkc0OjRmNLU0vTXFGnu1DyvOaHF0PLUytCq0DqtNa5N03bXFmhXaJ/RfspUZnoxs5hVzC7mpI6GToCOVGe/Tq/OjK6R7nzdtbrNug/0SHosvVS9Cr1OvUl9bf1Q/eX6jfp3DYgGLIN0gx0G3QbThkaGsYYbDNsMnxipGgUaLTVqNLpvTDX2MF5sXGt8wwRnwjLJNNltcs0UNnUwTTetMe0zg80czQRmu836zbHmzuZC81rzQQuKhZdFnkWjxbAlwzLEcq1lm+VzK32rBKutVt1WH60drLOs66zv2SjZBNmstemw+d3W1JZrW2N7w45q52e3yq7d7oW9mT3ffo/9bQeaQ6jDBodOhw+OTo5ixybHcSd9p2SnXU6DLDornFXKuuSMdfZ2XuV80vmti6OLxOWYy2+uFq6Zroddn8w1msufWzd3xE3XjeO2323Ineme7L7PfchDx4PjUevxyFPPk+dZ7znmZeKV4XXE67m3tbfYu8V7mu3CXsE+64P4+PsU+/T6KvnO9632fein65fm1+g36e/gv8z/bAA2IDhga8BgoGYgN7AhcDLIKWhFUFcwJTgquDr4UYhpiDikIxQODQrdFnp/nsE84by2MBAWGLYt7EG4Ufji8B8jcBHhETURjyNtIpdHdkfRopKiDke9jvaOLou+N994vnR+Z4x8TGJMQ8x0rE9seexQnFXcirir8erxgvj2BHxCTEJ9wtQC3wXbF4wmOiQWJd5aaLSwYOHlReqLshadSpJP4iQdT8YmxyYfTn7PCePUcqZSAlN2pUxy2dwd3Gc8T14Fb5zvxi/nj6W6pZanPklzS9uWNp7ukV6ZPiFgC6oFLzICMvZmTGeGZR7MnM2KzWrOJmQnZ58QKgkzhV05WjkFOf0iM1GRaGixy+LtiyfFweL6XCh3YW67hI7+TPVIjaXrpcN57nk1eW/yY/KPFygWCAt6lpgu2bRkbKnf0m+XYZZxl3Uu11m+ZvnwCq8V+1dCK1NWdq7SW1W4anS1/+pDa0hrMtf8tNZ6bfnaV+ti13UUahauLhxZ77++sUiuSFw0uMF1w96NmI2Cjb2b7Dbt3PSxmFd8pcS6pLLkfSm39Mo3Nt9UfTO7OXVzb5lj2Z4tuC3CLbe2emw9VK5YvrR8ZFvottYKZkVxxavtSdsvV9pX7t1B2iHdMVQVUtW+U3/nlp3vq9Orb9Z41zTv0ti1adf0bt7ugT2ee5r2au4t2ftun2Df7f3++1trDWsrD+AO5B14XBdT1/0t69uGevX6kvoPB4UHhw5FHupqcGpoOKxxuKwRbpQ2jh9JPHLtO5/v2pssmvY3M5pLjoKj0qNPv0/+/tax4GOdx1nHm34w+GFXC62luBVqXdI62ZbeNtQe395/IuhEZ4drR8uPlj8ePKlzsuaU8qmy06TThadnzyw9M3VWdHbiXNq5kc6kznvn487f6Iro6r0QfOHSRb+L57u9us9ccrt08rLL5RNXWFfarjpebe1x6Gn5yeGnll7H3tY+p772a87XOvrn9p8e8Bg4d93n+sUbgTeu3px3s//W/Fu3BxMHh27zbj+5k3Xnxd28uzP3Vt/H3i9+oPCg8qHGw9qfTX5uHnIcOjXsM9zzKOrRvRHuyLNfcn95P1r4mPq4ckx7rOGJ7ZOT437j154ueDr6TPRsZqLoV8Vfdz03fv7Db56/9UzGTY6+EL+Y/b30pdrLg6/sX3VOhU89fJ39ema6+I3am0NvWW+738W+G5vJf49/X/XB5EPHx+CP92ezZ2f/AAOY8/wRDtFgAAAACXBIWXMAAB7CAAAewgFu0HU+AAAWuklEQVR4AdU7C3hUxdUz997dTfYRkkAQoxh5SUh4gyAoEh4CgvqL/UM/26pYW2htRaFSCOzj7iMJQSSKlFb/r7989a/9fvJbC7W2VIRUa+sDW6smEKCCDx6CkLB7dzf7uHf+c+4y62azSTYBtZ3v253XmXPOnDkzc+bMXELSQrB6+vrUIiE1g2lzbF5tell2+YB9xGcIqfim3clkomNWvNduoKnNA97ps5nWPsw2pPzZ4LGWr1mdb/5Cr2eEdADEwv3LiCG1cYc0q6wUOxRg5oltPwVEhMg+33V67Pa+IdfWDqeyx6uqGvtBQX7+T/1t50RZljX4SfCLP771J3ojbJB9CLgnfj0VWu9vQB73fLIwevbZZDo10SSXG3k+4Bx5gKc7xIH1V+lMBRwj/tKhAjNcvJ0qeiyoqakpQiDZ4/nxo/WPJYTl8RyBIlpbWzuBjwHGrO6RTSwYCv5QoLRYdjrXb9myxYSNLypwCjqSYO0Nk8yRP/9dUUc+Sai4gBL1hNXTMpV5RzDqONwBllPNWMgrMYZOCYqr/BmrEPwGYccMVCbx1PpOacYIZTXDk0oQsA+LcqCA45rDJ+Ric1QemazndXrM5AoJEwFn6WsBz3VL2I4MetmhRS8zoFM7etkkS3Cfz3ejQ/asQvD6LU/w/tGNmx6F2VUpOt3uH2EdxA+CwjyEabfPd6vT7XkX092GnnS008qTji1IxryTXpaa7xGBkHvlQj46qQ15uoMiMVkWFNMrFaz97Gqqtc8XjPm3WBxvvMiBM8VJBKySiLSBqKlA0H8pRMbBFGM5Vvnd76TWZUzH3KV8BJL1AVf5bswE3RMcycKURAcZGFwHaXjrHSW8HvtupuF5mIc1V18QeV23MWjcE9hYkcsbUwH9vmmLU/OY7sABr7TJ/3ggFD8WY2q0+EzdTcVYrlRPvckYOfFrDtMp5kPFdshGVpuYjShEDogKpbo/n6W8vFOc2ii9MuAa82R6Wdb5fSncpDbKKINUAJ6elDM3+1HgjbKJqcvtaQV1DMou55Wwjs+LqqpJ07TbDQbDi5qqDjOacurWrn5Y11iY9oPtdvvHsPcJVJIWMZXdSevq6myhcPufKWGTcFNMp+qSPb+iRLsrx2yJhcIhXDNyRo8atfH4yVNxxX9+qKBpYikVhKKmpqZOaozINKJFsS4SjdzhcbnqJVGkS5YsUVc+uIKqGvlBOsFe5XH2ttfccA1jjAL15MTsFZKLBWZgrgScY566WDy9bo89xtnDex5wlL7P071B1qUeK57J9bjGcWT6hpkiZpA3U8g5O9k0XIMl6zVrbrwcyzh8tnHGccN5H86tKBa0uNEUmXuMgunWFULcfJVDx68n4ZMvGEViiwn9XrTK7yzqCj69PKMEwH7QcocUnYyqpDgo7FrRJJOk/ZaOgC5pUK301J/i1pKxRsFsEmwDv8e8Jbok+jIk6fj1PHtkOPNvmleaaaFj7qHM75m4NL2ObRzSaTgC8vj30wlkHIJ0IBx/CitFwDHyuFmKFYfFwrth6l1tZWc91HmM7gDjobKhQUMdQFjyxHBjoDV/AY0HH6KScReLhWptvsM56XgxnzUDCIkE4NzhN4nMplpHDY0HP1pKtMgdVIuNtphBXxklwbAaYYLpRalg8Kqc4IdHqf1AtzQyVgac4x5gomEI1cKzCFOvIsTwq/iQSfaCe7e34dSjcmOnJTNT70Bip23eloGZ6nhZRgZ4ZV9j3b4R944UzTlKbuCPx1Gp+4qrz+0U9+SN6YrZZ2R9aXjRUxA3GE4YTWSehjhZ3k06BVyfGsk2O3bsSMWVsHrA5n7U5XA8DJv7cwZReFZV1d/AvNMVbdPmevbwqpVU9npvh0m2GOCWNjQ0iB9+/El89Y9WwSIpG+FE9QvYGf5CNG0b7umy2/OmxXz1rNWr7w4iJy6PNwCRFdNNBw62Q2QAOImKxvsEj8/nBPNOAoK4cEgxTRuMgDyIUsIykx2O38Dh8B5cEHA/xwmPAfZ6VQXTQmMseYiXDIZr4xbFuGzZMgNK78D77/Xj+KhAb8a0YDROkyThZ7pogOMXREl8ybF+/eNwhN8tOx3zEai6tnalGlNNgkFU7FVVW7EMg6+m5mFNA64F8SwYJHsYjdyB5ZIgbF+7dm0bMunxeMZrjFYJIn3Xabf7sB56LeTl5ZlC7ZH/kiRJjTPtCSzvU8CpFtg0p6xPjS9lI1jf9dNDX3Fm3A2zRaafg0VjHcJf9LTLlmgmODBIXk41XjLBdFV2URLgSCUSn51+OuR1PcV9ZgCXWfgJKHpVJX/riVBX9cnjFwdAUQbGXbcmz/56DS8LuEY/TrT4QEINIyiLlgHReIAYnrINHFtNybOtipjb7K9bMNK233aENjR0OCdzHF3FnRgglZWEtnzcwStmdb//EJHBKEnZ1fx1s0YqJ986yKqHDVTaI+8RFr6mufzjoyTtoN4V4R7L/d4pt/NDayZgtIKw/NyTlf0C64dqcXmYvjReMg9RwFl+KhPhTGVxeTgLOMv2Mm/CDsRFKhNc1mX7wOoJuKfOUqpnjM2mR6wuQRicCtuZLyGJrIl1B8g2dOGZu9AIZ4LinrgSvHp+jge8qmcUV9kbPJ8a46xJzWO6UwEH0MVYPMUasA8P8bL0GJQybiHnNzNT/t1cX2zew0UWU2gK2/KASbeQLzRiT04yKMYZpZhNXTWThkI6ch0QehgUr/0BiSo/snoPXIU94DMBnc1XUdN3rbRtK3V+kMSDMEFt1C5GxYiVvl+J8Axgg/nDCsj5U+MtzPxytkatzhNyG3CPlTU4gJz5+bdtUEi5XjBPCQvWTpvA8zrT6HTdsTKX1XyuC373xO8G5PL7u3X869S6+MNeKd5pC1jtEBZwlf2VsR0inogCjrKdUCdxUSOzCKszsmEY2Cw7xKBjBPPXTJ/WFfEudSCVFxSjRTXtoVVH4XzEjCHH6ngoBgsepcf9wnWTyHZZd6HDOLB26+zBcK5wKAFNUxzrzlq8h+mhY5H9k58isVScPJ0cO16QKeaHEb97yj024+ntSiRvC5PMe2hUuZew6EyrgRWidanFGAnFhX8y0fyUwNpHaQVjNrzdduafs7o5yHRaihOLSCNIplHjChcWg7exumueCwb9b9GqY1TfessrKBFe/x2HSWX845VX5ubnXbZOinwUPNP0hr5CptanpjsxECTPzyWm/HEsOnFawBmZDh6qk6BXDrrmEJcW1bfehsZUPB3SV/b7JKaQAQPNa97+RNcP3rIDVJaZhGJVdGK0u+aoiLA093mL7g531nXAgH5711ODrGZBT0gy1cMRvYavjpnqv7AyJKqAxyRbApdcArjMMmqy7ANGsmXiksKh0l5ShF84stSjd/rROQPxjL3DM18qLOST4k+vS4VDF4BUPnbsrNFjx5aLVPqspaWlFRjaDYxo1dX1xXFV+Tks729SwXDSbM7Zph/Ha2pKSSy+12A02GMxNQ8QlsMifAoIueCnYYeowTAfTt0lRJJe1SKR1QBzNycMh9+XTIb+S9qjn52AQ2yuIDAWEyn9td1e9UuLLe93cPZX8aj+0UcHTzOmHYUhnedyrPtpJBLRccjr1rVA2aexaHw0mOrbZKf9u3l5/exIHADAKgezXGMvwIl4m3Pt2vc0QsfL9fX5KF249wWG6e+rqu5vFUXBjQgFp9P5JzhiD/LW1Nymwpmbh+LiYgY5Dc79ewG5ZF9XheLHn762w9n8TUgnGsBxHAPAiXCx+HVwcByDy8aV+APwp9VA4Irm5ma2YsUKvyDQR0EKDGgVYBtpK9z1//D+7+sY6h/fgmXdBZ04AghMQAY7hLKyMnbo0KEPQYQGj8tZj71ubW0Vli9fjlsx3bx5c67f7zcUFhaaz7We3+T2eo8JAKAjqdmypSgW+3zLht7EKaER2IjQpdKRFiUxoB/m1ME9oifRcwJ3Mq/D+4QrsADzJ0+eVKurqy9H6fiV0DYiigvOnTsXl12OZcBTvjhzVkXT7Nlz19BYdE80Fv1k1uzZZfv27v1HTk7+UIFqg+CGJWqQpCN79uwJg24Ic+fePBWuI/0g9f4up/O16uraldFIZN+ceTeN2/vyy28h4d1/+L1bdnu3V8yavVCSxL/H4/GTwIDauG/vzoqKirvNNttdN8yYcQv4m6Yh/FcScMdEwopn0qPB6im6e/8rWz2/EgkAURCCvl4p8thfBjyT7kc+vpIN9KsSANBNLB+QgKPwoZBn4hLk5csUQocdBIl/yYHxzjLRskaNh57xb13cXzcoLkyRL5qf5AhkQwjWOlzxk0txahusIzL8miopqYQTRfMZHXdFWVECvrmcuQFAljuuqGiyA1LYlRlVnKVnYNfdCe6g+3B6wHkjq1uZVD56m85KALzjId8Ni2Nxy5/6ybvP8TJOkG252RT2RwaoVCtgqr9AiEdziNgfrrBC0TiJ+lXr4NP9J0z+lM7qeDufOGDBAxQZgOTRLwjxyFzLkBlF9L7/DnDhcBpfRKwvQj0ilitEAnaupsX7iVIbrtjPNF4o423pit+jrXL8wo8Xk6NPL80Z9NkHl8eCpycEGn89E15aLbQatTICJ2nFz5SgmPs8Fc3/R8jruyiTPrTYIiblVNNkQLCPNFTCFO2dxzFJOMtEdhrA1XTz/MKg/9NnLJcPrqTLfxvKZoQQpmFJpVBZjlOiEewlokJCnxbsyWVm5dRb95F4cJ3VEhvUHtSISRJJiOU9BjffYEYBIBqXvXS7Ztn33oGxZZMM2EJxj38wII/Rn0rybax3mD6HRuEcfmC47lVhTbIRbljPRp0lDH/MN4TB9riLQ2d8M8orv6yY30UozvI/wKn7f5BuVz6nbHnaf0Gw4EBbzcCfBXfizdgWXnJtRf8Xen0DrrG/4vhw7eHpryTmDCjOUfvhp/s+sAxHs7cMcWuw7ZF5Q/z24QHmgycQ7on3Ih5OJ+Ac9QpzgxfSMZyF6q7XX2HxrTMben3hq0e8SU1wjXma1YxgId+MKTrTKQ+Ee0LCO8jgxALvft7RPZ/OUb9J4Lng4QSnMubBy/GtuAza4BnKgp6JcIgAAfXgdOAu29NyhRWd09jmkgauuoGaGTNRCKC6HwXrbtPfDKJDujtiqaMCU+nvrLqEgQ3wD7QFsF1qPe8oPGKcHnKAy9cD08Q9BSyNzELgtIP1d1we8Eze0+69cUQCNiFUTF+yoKv+BYsN5qyXbYD5Cqoc9E39D06EL57J/IWRa920sASE1obPjFDNk/UZ5jgXQtB37a3Mi37xEa3KxoWDsA1OI7yySmolXOwAvjN+z+Rv6/VfxOhzZnkM1p1+ZYl5ONSswGurhEqXHlZ8U+7kcDwOyGN/guqMnfG7x63B8p4WU95BeAv6BNs0DHaIcZs4vrZt3yiAhXkXqyllft+ke7A82x2q1wsXJ9pVjIQpmLDnN1cWiv6Wx8w0eBc1wGVCTCRKXDpFWGyQRdKIoua8lec9qK8d6bj4+gDMQbJjUH5SOYid/BvcVIC3hhr91n5skOKXdseuKP964fKG8yjIri4jOmJK5C65AAAt3QdWYkVTI0M3fmv90nypbf/OXBK4kVIwcuKiajYwUTCBkwXt0Bh8QAB+l3CMBsBbcoZqaisTxDDTNEEg1MooHUhZfJDFCkahAdiFZzDBSCwiikYTKxx1nfmhnW/oo91UCfR6bzUiC30K+ijJuPVVAGeNBEf9AiI22aTdGCwb5WIbojeS4KtEYaZXw8aSmTb7K8m5zonCcVAIPdpSSKIfF2piXp7I2s2EhQQmFYZZu+InA/qftfS/8yy8vE1ewiveKRtyBP+aCDG26XjKoPNy7zuPbXsUAHY0kypiWSi34go14p9O1PLFij12q8VGLXA3FiPhczuIqdBH1772UrKjXW5bMrPBU1Q4RbYmTpEhWkHgoeEwCyMNFvC6NjDyvef1qcCnF1EZUaIasw4oSFynw0kTzgycVK9i6EfPQfFMGwOWztWa0QqPVDWBqbGoGjl/zmgbcOJk0VXHh9y7HR2HybADnlwUwRVahdyYtPuTlReR4ALwO0p3ClQYZPU0T4Wy5N1xX1D3qAGI1KL9tQlU/QCJcC2HhxJjRrIGEHozPA9IJ7wEn2x0c4WXDp9NXtdEmGZoOCnvuaYS0bQ60U6fgh29ttkg/HeDSdoCYAnCG6lXkX8UysX2Axawf/2AlqHuJqu/PR98EkupcdB/ItdufRH+1+f/ojhMHWVwoT8d9s0uQYQ49y8K8b9b41OP3GXBLfPfje9Lxi9qQqo2XCrEyUUEro5QuvjDFVWPoSzj6oqnNrfbrb+Zu8AIfqOr342Wl+MHJeD5gqsoiIBnPc1xY5a4XC79CpRfCMPNIcWLPbxL0wG6+QO8HJcGL5cp3Mfqd3DdNEGXM16bCoAf+UT+BM4fJhAhkazWwVQUv08EYSkRDN+G18WXYzmvxzQ/rm7cuPFyyWSqBJibJcl0q9Fo1B+CjZkwYTojgkOj4j3QzoBt9GAwjAaa34JN9BaN0q+B8C7D8paWI4uaDx3yAM3qg0eO3JAA1v+TA8PL+E060CoAPpdLknHt2PHj1zW3tOjPsRGO85feBj40KzzQ0vJDuLSugrfmTlEUb0dwhEuMFtxaDygqmnuurXWys6rqbaxwyW585DNeIKwIOuNHQcAPNQLb6I2dsvsxs8XyYHso/CYVaY3Lbt/p8/kmiwbjW+Fw+DS0LYE2SSMJLizflgzSRE1Tm0Dq98NN6itICwN8rHowNydnpBaPTVi/fv07qB2oETz21NZOMorS/vb2sA/esTugic4HfCldKhlNB8LhkB0uO6uBngS/OPx0fuFp+l8IFfbBRfp6pCNv3lxIlOBZECSoOStBYAHeq9+ElalBI+xEYUHhlNa21vugvB5+qCkoAHhPJetEgAUpx2Qi4WBoj2x37Fy27EmD3b58/6ZNm662FBacggvxCGcE2mGAd/MmEm2POOBFwCuIBz+202/1GfubCQTQ2to+F+DewWmR7LxnwzgWV/eHo+HP4AH+X6HdDaBJBri8Z1FNi7YHg0eLBgzwud2+gy6X/Tl8uA8wMSQII1UALw2qZI/vU3hg/0d51aqDUJwYeOg7dkSDi3IHHC6/Iwjic/Dgfg9M7g8i0bgV8COOLgOqHELAdbWOsLgY3nVBUBQFv1vU0zz+HIle3MljxHHA6wgdAOFRCBhrJFpuNltJMBA4JjucL2JZWhjK88gTBOy8riFul3MUaElZNB6v0mLautq6jZeBoMn5ttZ2URBuFdxeXwiu3T0G0fhNl2P9KjUabVy3bh1KiS+AOPIZg4BKAezCzZbO6IkTJ/QYhQoNkh3BxlCGwHo9pfjVVSLgIoYBHiPoZQLwn6hJLJaYList/V8Q6j/hc47JXq93BJbhKEOE35Do5jxqC6TN0Hn9u3CoYzDltuA34zFVXQrT5i54NTGoas2P6Sr4nBPCU/Cd6EvinNlzQlabdT7MWdvNNy/4AzMYrpozZ85NwMaHJlPOomh79MyCBfNbLBZLZPfu3fp8vu222/LhocEVcVWr7Jffb2QoGP7wllsWvZ2fnx+Dhwz4YT7vBMYMXkhclpOTcw2MwndsENojkXdvWbTo6PDhwwPNzcdtCxfOGRyLxb/Zr1+/klAodBhwNcFXsdHrr79exwU7C1h9rsdnVswOwscru2bNnhWxWYuOzJ1bkcdEcUpFxewHWs+dP+902j9AQQ8cOJA0Njay+fPnva4Eg4tB7ucrKmb+Fsr0QfV6a+7QmObU4mzx/wOqQUabQ2Tm8QAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.arnes.si/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sl">http://www.arnes.si</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</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>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aai.arnes.si/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Academic and Research Network of Slovenia</md:OrganizationName>
+    <md:OrganizationName xml:lang="sl">Akademska in raziskovalna mreža Slovenije</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">ARNES</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sl">Arnes</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.arnes.si</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ARNES Helpdesk</md:GivenName>
+    <md:SurName>ARNES Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ARNES AAI</md:GivenName>
+    <md:SurName>ARNES AAI</md:SurName>
+    <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ARNES AAI</md:GivenName>
+    <md:SurName>ARNES AAI</md:SurName>
+    <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net.xml b/swamid-interfederations-2.0/idp.aco.net.xml
new file mode 100644
index 00000000..0a430678
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aco.net.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aco.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-11-23T13:36:52Z"/>
+  </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">aco.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">ACOnet Team</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
+        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
+        <mdui:Logo height="60" width="137">https://www.aco.net/fileadmin/aconet/Logos/Banner/137x60.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.153.174.0/24</mdui:IPHint>
+        <mdui:DomainHint>aco.net</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
+MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
+AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
+3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
+RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
+T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
+cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
+9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
+MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
+Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
+rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
+CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
+nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aco.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
+  </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">aco.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAOmKQ6SgpmK/8vtQmiMBkQ1+yZ1XMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5hY28ubmV0MB4XDTA5MTEwMzA5MjIzOFoXDTI5
+MTEwMzA5MjIzOFowFjEUMBIGA1UEAxMLaWRwLmFjby5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDtABRog8uPB0h8aNilZFdYFII8iLgBkDQoAXH1
+AIMLVP8dDaK6dRnwyBfrq4dfEH/BqQxxpmASXK1s6O1YbZcx5X9M48yzzpdKFkGU
+3SIdu4lLNYtR1nfePX0120NTBk9tzCR0R9mmV6YMajFQ8YQkyDzwboTTyILx1E70
+RsFIvmx59QDtdPjP8fi2X5ZsRb1kOFDKeJlI15/SQkWAJGBIjtb7Dhs5K6jlp2lh
+T3R5G+faRrC761qR0ddcmh6qkq6fBGRRydxn85N5L6XkoxfD2evTSEkTB2sKn8UG
+cDNupxjPSD6PIPQhDuQlDyg6sFcMj1N6/PvH6FDhca/WZ72hAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5hY28ubmV0hiJodHRwczovL2lkcC5hY28ubmV0L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBStGKLf2/BAuxR9PAnCFKg1lXw+azANBgkqhkiG
+9w0BAQUFAAOCAQEAcYbfERAghPNJSFLnx4SYwmh19ln2j67IdFaEzGnZ10oNtMF5
+MXbJXqLN/JCEj7QLjRQ7PkhCpIUnKJ14ELCt/7ChnxfUHqwiYDyB3Vtm+FIlaNnJ
+Bhet+AJpiVyb6xce6tLQnQ/UwNmPozPjOwEbuKhz5dO1uftI38FT4hBYzsdo76Hm
+rS4WKwBzWV43OcNVhv2sgDbsxGIi5CGnQm6POICQhXAgvG2BGH+77jwM0PVFNP1b
+CQX+4Ig0MV2Y4WCgu3y2IxpSjGtnHxRxLMyNFblaP0MTo8BROcC74n0jKvnSVXyj
+nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aco.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>ACOnet</md:GivenName>
+    <md:SurName>Admin</md:SurName>
+    <md:EmailAddress>mailto:admin@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ACOnet</md:GivenName>
+    <md:SurName>Identity Federation Operator</md:SurName>
+    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
new file mode 100644
index 00000000..de5b7cf6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.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">grnet-hq.admin.grnet.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
+        <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:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
+        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
+        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
+        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
+        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:37.98709500,23.765772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <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==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.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">grnet-hq.admin.grnet.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <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==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr: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">Greek Research and Technology Network</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Greek Research and Technology Network</Company>
+    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+    <TelephoneNumber>800-11-47638</TelephoneNumber>
+    <TelephoneNumber>+30-2109569181</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>GRNET headquarters</Company>
+    <EmailAddress>support@admin.grnet.gr</EmailAddress>
+    <TelephoneNumber>+30-2107474275</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se.xml
new file mode 100644
index 00000000..f87ff55f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bth.se.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
+n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bth.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUQgDlaShYZmw+iODFd4PDl1a+3QEwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmJ0aC5zZTAeFw0wOTExMDMxMDA0NTFaFw0yOTEx
+MDMxMDA0NTFaMBUxEzARBgNVBAMTCmlkcC5idGguc2UwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCNOKwblSFiLSbItG/y118MRAXCguQJ4e7t+/e4bYhD
+fl9Qs5gTx3QJxXRgjISLrha44rc+awS6fr4In3N61ijS/X4Q0qrD5BszzCUw2Lni
+YITovYjH9wzZ3oOt5k67rtXoDL98B+Xqbh/M8lOXkcKba3Slsbz/QKg5Qf6ZCebc
+76rl3J3fM6ebYOyiCseCVTn+avpbqNKMi7sY6vfKDIo/zCkN3ZntH4ibGOi0j9z4
+5NlHLtWLShfwF/QLLKjd2alHTbyBjdDe22li9apxZB3LhZXFVGdYqBCJu0OBeFDP
+ZA4ZSWoxXMqxDbbJofMMbHysc7teqG3mJyDm/FL6hXH/AgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5idGguc2WGIWh0dHBzOi8vaWRwLmJ0aC5zZS9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUtNB3i29Xb36JeEa7RhFXM4OYTYYwDQYJKoZIhvcNAQEF
+BQADggEBAEGhHaZmmHhnfrsYc/trO15JWt5hU/UC9J7xhiF2iIk41ymeX+gvm6n5
+h2f4/xEgvmBwV6WM+BlQE+weK+nQNceV+aAO51xTM828O9SrmZ9ZPkw7+TxGiVdM
+SnxSTRcEWngxpJ+CGpgzy1SgV7WqO2NszSP+XRRJHjb0Aw39iKLP+yfvGdR71lu/
+2WPhhxaK7wun8loJJC2WI4ORwsh3mJoYZcVEIOXe/H2Kf+Hj1le8z9j1pxEG7ECY
+DyL5sSS/5Zez+fgoNphWb1E3fB/wSvJkxDe28qOsnvsHl5H6RkSFjPK5nAM5Qfp7
+n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">BTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Personal)</OrganizationDisplayName>
+    <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="technical">
+    <GivenName>Tom</GivenName>
+    <SurName>Martinsson</SurName>
+    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.canarie.ca.xml b/swamid-interfederations-2.0/idp.canarie.ca.xml
new file mode 100644
index 00000000..7ea0bd11
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.canarie.ca.xml
@@ -0,0 +1,104 @@
+<?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.canarie.ca/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2012-08-28T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+http://www.canarie.ca/templates/services/docs/CAF_join_en.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">canarie.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CANARIE </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">CANARIE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Canadaâs Advanced Research and Innovation Network</mdui:Description>
+        <mdui:Description xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
+DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
+topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
+QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
+ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
+ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
+3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
+cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
+otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
++WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
+7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
+8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
+DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
+zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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.canarie.ca/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">canarie.ca</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJ3fH1HeYIxXxMXYbZ/Bx85j/JgKMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5jYW5hcmllLmNhMB4XDTExMDcwNjE0MzUxMloX
+DTMxMDcwNjE0MzUxMlowGTEXMBUGA1UEAxMOaWRwLmNhbmFyaWUuY2EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmyqTo01QVuqHI/ZXAdYP+iX6NjP2
+topfFsR4y8TVYFN4vMvb5ZSFWPPjJ8T3O2epI8Hy9q4FWyPn1Pa/CZoFi1EMhu7b
+QJpOmLzeX6FOvf1X/5De2JnWv7JWMpUMeVqupe2YeCtoaXfViHOB9pW0go2zr6R8
+ajvQKxNX46V/o1ND6YwnlKRNsh4hn46cPtl/DNeKYFz4Uj6OHBRSfMHTZCWVENJB
+ife66AS7X5hC6o7o2Sd5VHr0TgY+ZeKrl3/33war+RIGXr6cRW9iA9yEeW0Oi13Q
+3hkjPT7MNkvNJjWpERR7aBogQ3z5Id8Ygl+WASbyfoiXNCHPa3USAaynAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5jYW5hcmllLmNhhiVodHRwczovL2lkcC5jYW5h
+cmllLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRDEuTlL5Y/HfiEJ/wzCfCz
+otFdxjANBgkqhkiG9w0BAQUFAAOCAQEAD6WiCAdkGjA7Bza59pnn+/z5/Jhwn7Mf
++WS0WAPz686nIxYjblMBjIVITedkAFvwnEBn0Rs+XNXrc90uRFCNFf4VfSP9NLEf
+7cTPNxHiGt6TqOju2Rg6OBmNwRqAtFNqKG7VeKgoiZ4FcRVU2AdQ8fYnxxtwO4xJ
+8Md//Yp0lGQzj2FpSU7dnbVRGWAEE3g1Ghjrwe9Aj6e6lunZNaIdTZ6Yvnsa5qly
+DngkPipfHlmi56QMo9Iqa3nEKaCv2ykKzTIIUdgDI/M8sHXgitp5tFrAK8f96iBu
+zwZrSXVMnjQppB7E2l48gea/BPyFP4FBlxeN8E6aIXH09uN+HbcohQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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">CANARIE</OrganizationName>
+    <OrganizationName xml:lang="fr">CANARIE </OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Network Operations Center</SurName>
+    <EmailAddress>noc@canarie.ca</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.capes.gov.br.xml b/swamid-interfederations-2.0/idp.capes.gov.br.xml
new file mode 100644
index 00000000..93d10b48
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.capes.gov.br.xml
@@ -0,0 +1,144 @@
+<?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.capes.gov.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">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
+        <mdui:Description xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.capes.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.capes.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
+WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
+CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
+dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
+cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
+NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
+IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
+U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
+HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
+hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
+N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
+1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
+MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
+ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
+aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
+geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
+aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
+IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
+bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
+Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
+VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
+Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
+dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
+dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
+LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
+hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
+LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
++MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
+DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
+nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
+inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.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">gov.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIG2TCCBcGgAwIBAgIDAX73MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MiBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNzA4MDUwMDI1
+WhcNMTUwNzA4MTg0NTAyWjCB3zEZMBcGA1UEDRMQWkZUQ0YwM1cybTk4eFRFOTEL
+MAkGA1UEBhMCQlIxGTAXBgNVBAgTEERpc3RyaXRvIEZlZGVyYWwxETAPBgNVBAcU
+CEJyYXPtbGlhMUQwQgYDVQQKFDtDb29yZGVuYefjbyBkZSBBcGVyZmVp529hbWVu
+dG8gZGUgUGVzc29hbCBkZSBO7XZlbCBTdXBlcmlvcjEZMBcGA1UEAxMQaWRwLmNh
+cGVzLmdvdi5icjEmMCQGCSqGSIb3DQEJARYXaG9zdG1hc3RlckBjYXBlcy5nb3Yu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAj3RA1SawXYZGlYDg
+NH5QSDR9ciTBLW7bknhlxAhxLILCbGBLu667A9id8A5eQYwZSzrf5kN9GPoSzvkD
+IGvXn6Ke4fmA7gcBv6t9CYJMbPQteHYwJHneMX1hPcKdE/CqR+01R72GCDFCA6xt
+U0aMnpT1kcpMVuQC3LP2GZJUImFIIaH3YeQkLejgFGheyBAq6PnO/yXR7zdJY8rL
+HzOYDxER2xUXVXozHEyjoi47VSglNcnQnrOzYUZiVmTfk+o1r8PGREex0JMDn+ik
+hEeTr4zzSMst5QHsARLom5vyD4OwnNyJo9kJELHKDMUTW8iu6FCmjNMT/FcKCy3W
+N6a/AgMBAAGjggLtMIIC6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFPZEJt0d5X8oAnIEBSoy
+1PfJlikuMB8GA1UdIwQYMBaAFBHbI0X9VMxqcW+EigPXvvcBLyaGMCkGA1UdEQQi
+MCCCEGlkcC5jYXBlcy5nb3YuYnKCDGNhcGVzLmdvdi5icjCCAVYGA1UdIASCAU0w
+ggFJMAgGBmeBDAECAjCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEFBQcCARYi
+aHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYBBQUHAgIw
+geowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqBvlRo
+aXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNz
+IDIgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBv
+bGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4g
+Y29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNQYD
+VR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0Mi1jcmwu
+Y3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5z
+dGFydHNzbC5jb20vc3ViL2NsYXNzMi9zZXJ2ZXIvY2EwQgYIKwYBBQUHMAKGNmh0
+dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczIuc2VydmVyLmNh
+LmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8wDQYJKoZI
+hvcNAQEFBQADggEBABj1dE12jEodgbQi96WwcBnlyh8awDTBKNJK9IDqVoeZvrWy
+LwuTxcMYhIqqdZ3swxY0se2xJOLUyrs9R5P6z1hRr3Ey3kkyZYUYZ4d0TTouA8Av
++MDd/ruXV0DyarkYF+u1evTDcm/hKT9Vp5eqa7iaA8hDK9jFL8OKUprHcmvqy19N
+DjZEt+NigC71L/ssIag3gK1KtjHuIdDRYnc5u2ysCGa282zYO/0u2AA+pFehclYw
+nK56c5pDTUjPkC8FdHv5CneaSpEKD5idpN/VuNhRTYXwA4kt31b7JZfGtQ7o22QW
+inybujlVIVrVxtaJ34R7yirxKZ/Y6VFxLKKuiYw=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.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">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
+    <OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.capes.gov.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marcio Jesus</SurName>
+    <EmailAddress>marcio.jesus@capes.rnp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
new file mode 100644
index 00000000..f497452e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk.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.cardiff.ac.uk/shibboleth">
+  <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>
+    </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">cardiff.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cardiff University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cy">Prifysgol Caerdydd</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://static.cf.ac.uk/images/FAMLogos/cu-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="126" width="128">https://static.cf.ac.uk/images/FAMLogos/cu-logo-128x126.png</mdui:Logo>
+        <mdui:Logo height="62" width="64">https://static.cf.ac.uk/images/FAMLogos/cu-logo-64x62.png</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://static.cf.ac.uk/images/FAMLogos/cu-logo-80x60t.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>131.251.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>cardiff.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>cf.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.487626,-3.178638</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
+						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
+						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
+						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
+						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
+						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
+						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
+						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
+						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
+						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
+						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
+						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
+						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
+						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
+						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cf.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cf.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cf.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk/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>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpDCCA4ygAwIBAgIQOAB7zJmYDdlOs5pElATXjjANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTExMDkxMjAwMDAwMFoXDTE0MDkxMTIzNTk1OVowgYIxCzAJBgNV
+						BAYTAkdCMQ4wDAYDVQQIEwVXYWxlczEQMA4GA1UEBxMHQ2FyZGlmZjEbMBkGA1UE
+						ChMSQ2FyZGlmZiBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2
+						aWNlczEVMBMGA1UEAxMMaWRwLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEA2SV/o63uSLmPFh0y6isL9BrgViJ23SovxgwDzlQhshhiZ6nO
+						FxnnbrbVdwTAh63xgMSu5qDay6VSZF62sWVZQwLG9Cdi+eInp4F+eoAQhMztDutV
+						m4PVf5dwLjUG6flDQnFkVBgDqhn3oclVl/tiFR1U+lMMDR2+gW6i2AGUmNGstd5R
+						5AwjGHoguqBHeJ47VcD8UBIaGr4v+bmfsTyZBu9Z39OY7yZ0/XxUoI18kiX4NjwG
+						jf0YfMfbF1eUkF08Y6/lAt6lw5Es9QpUgcdylUzfWfYLduc8BiKMEahl78JzSe4Y
+						RIhksJvqioGgRQ12gePXM6jiL49kFcXq/8xdZwIDAQABo4IBXzCCAVswHwYDVR0j
+						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKrcERbDCnu2zOsc
+						LdMKrxqmKHVNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
+						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5jZi5h
+						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAhrYmmoW5OdIh78MzIBUjJGkTNJ2BWrB5
+						0IKjlP9Khup4Q6c86qEDWX/Go8t8bC6ab0YphnBulP/yUxcV4iopNZl3YwSyrYHX
+						dRJL68o3dsjlW5qIDq+Priug7/5C9PuxfdHGrRL3keBH/2rrOFf39hHuWBZmEMHj
+						HVqadsAqvJqwP4RUYi3BZ8fvi3QXBdvJlIriKn+2xUdZ3AF/6BMyi63lSWgLe8Lf
+						7n1IeJ61VKfNV2Tq9fFN+VZL1BBdOjoAW2UvoGGB5uvF+prMF9uUSs1zyIMlk5NI
+						BCZEbXB6ZmEupEmDR9Gztw2fvdSgXht3AjxW1+hV4ShOdi/LpYbkZg==                        
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cf.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>The Athens Team</GivenName>
+    <EmailAddress>mailto:athens@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net.xml
new file mode 100644
index 00000000..6863a333
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.company.ja.net.xml
@@ -0,0 +1,112 @@
+<?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">
+  <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>
+    </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">company.ja.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Janet</mdui:DisplayName>
+        <mdui:Logo height="100" width="220">https://www.ja.net/sites/all/themes/janetbootstrap/logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://www.ja.net/sites/all/themes/janetbootstrap/favicon_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.62.83.0/24</mdui:IPHint>
+        <mdui:DomainHint>company.ja.net</mdui:DomainHint>
+        <mdui:DomainHint>ukerna.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.57732,-1.31070</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
+						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
+						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
+						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
+						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
+						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
+						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
+						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
+						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
+						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
+						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
+						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
+						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
+						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
+						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
+						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
+						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
+						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
+						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
+						Wep0+6npqDM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net: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.company.ja.net/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.company.ja.net/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.company.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.company.ja.net/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">company.ja.net</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDxDCCAqwCCQCSYXHhJnkuQDANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC                                                                                  
+						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3QxMTAvBgNV                                                                                  
+						BAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChVSykxHTAb                                                                                  
+						BgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAuY29tcGFu                                                                                  
+						eS5qYS5uZXQwHhcNMTMwODI4MDkzMzQ0WhcNMzMwODIzMDkzMzQ0WjCBozELMAkG                                                                                  
+						A1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZEaWRjb3Qx                                                                                  
+						MTAvBgNVBAoTKFRoZSBKTlQgQXNzb2NpYXRpb24gdHJhZGluZyBhcyBKQU5FVChV                                                                                  
+						SykxHTAbBgNVBAsTFEpBTkVUKFVLKSBJUyBTdXBwb3J0MRswGQYDVQQDExJpZHAu                                                                                  
+						Y29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA
+						CHs8wVfzqZ7PrFLGngMY/nmawPUO7E0DcwDNsarh+04vbE3jrcQf7iZNsG8lo/ZF
+						Z8NfNvNwHYZ7z40O7cf5Kr7YSpqCNcC+InWsXOjhRo2blpwSpUSQpH1IzHCMf3Xf
+						efm1vG6Ud5zm2M05GJklL8Imz6u2pLQqgcxsLhe7C1aoP5P2GfQCVukgJ8rtcXN/
+						Hh0JggwZ/ZEKTHL8EJQrU0zAj/YSVeffpmOUAmUVOb8Tdy+NL1PHNNTNkmZ/p8Fb
+						vw7i66T0BDgbjmL/s4pq1DhI51Rh/qaMsCaAH6nGmcmnLmi7RpjQ8cMQlCVBpfWM
+						LRVVoHVjZegHjqqZ1f65AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEtsQZdMCu0F
+						3VG7uyuu7UwUJPqfrp2DVd+ZW7ZePOzB0HWxsLKPEl0rdpeE+aMrMh3wbyV+1nJu
+						N7P1L0khqg/Tw4N/30tdbAYQKo+TjguzFCThenplL2zC618RtSyWFCOO2ox+4Arl
+						PhqPY3Zo7m2A1nfYkb9dL5VSbIUFztPgH5JpTTzutkJD9lQssw7JbB2cgkmHN+z/
+						F3+Xa4HqsEp30yzUMbAyA6jhduRqxMxmpDKB1micNlYOOQCKU5m9IBsHd6Vv2MYr
+						VeAgBIGPI/3oLSP+OhTm2TadX03on1OYUn1suuC9ypA5+IKSDb4bKJIq0QrHTFW/
+						Wep0+6npqDM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.company.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.company.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Janet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IT Support</GivenName>
+    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>IT Support</GivenName>
+    <EmailAddress>mailto:it-support@ja.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.condorcet.be.xml b/swamid-interfederations-2.0/idp.condorcet.be.xml
new file mode 100644
index 00000000..e2938d0e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.condorcet.be.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.condorcet.be/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">condorcet.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
+BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
+IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
+EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
+Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
+KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
+gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
+ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
+QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
+MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
+Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
+1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
+0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
+QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
+uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
+NJp/Skt7sw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.condorcet.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">condorcet.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEszCCA5ugAwIBAgIQQTL/jgzwBt0Zt4eFr/Kq/TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTIwODAwMDAwMFoXDTE0MTIwNzIzNTk1OVowgY0xCzAJBgNV
+BAYTAkJFMRIwEAYDVQQHEwlDaGFybGVyb2kxOzA5BgNVBAoMMkhhdXRlIEVjb2xl
+IFByb3ZpbmNpYWxlIOKAkyBVbml2ZXJzaXTDqSBkdSBUcmF2YWlsMRIwEAYDVQQL
+EwlDb25kb3JjZXQxGTAXBgNVBAMTEGlkcC5jb25kb3JjZXQuYmUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8IZudPSFwYHUN9qJl0ee4qt2gbtCX5C3b
+Y8CB3OGDUTXXAcfw3Dqr0sYUWWHnMp3KSKCq6d5BGgkvslB+6hgxfOuO0sp+Dble
+KExmCXbL/V4PP8I9KPFRZw4hL5HPUwaXjQF1b3bALi/gNwgOa/bN9TDcx0yR9XQQ
+gp4UvNw1Y8lvL+/FP9nxSviUrZQYS497g5wLdWiuhYaCFhl0Sen6KibTJRiJ4e0/
+ed8cIMEwNEhnuHEPDthWkkbpGR7cjEbxRUNoIa2JCR2JggjeGmkbqSAu8JVC+THu
+QVF3nB0iW4duyPnkgyPghPbKcoTZb36zS9ZF0QBXGkY9CF23MByvAgMBAAGjggFj
+MIIBXzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+UTeSbrbq7beqOidXG1uSokjeL6kwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQw
+EoIQaWRwLmNvbmRvcmNldC5iZTANBgkqhkiG9w0BAQUFAAOCAQEAMb4GDYuU2fQS
+Ft4HCYoWy6kP5JFiXOjijAl03pgZRipb0GFYDxAKbkHhppBeQKa6Pw6X93psE2L3
+1rm3VjUouX+wL0P9C5rV+cxLNfz6HjySn2vr1S7hip6Yckx8rqJ5wVxFKwWthktG
+0SbR7tWOEjoqiHnDXB0upSmcycbzuo0l3DymN0GimL/BtkeCjTfbDnCenL7JjhkC
+QvV9sXeiGEScuXD4gS4nFwbGMIdonFeoxaLx/Ddo0qNkNa2bevtZpOaI0D7lUltk
+uAUlD9bJAGCVw43tjyIHEHSU/Np3RPZcyRqJGsxG5i5S6wqyH+YVO7y1GANOL2WV
+NJp/Skt7sw==
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Haute Ecole Provinciale de Hainaut - Condorcet</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">HEPH-Condorcet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.condorcet.be</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>webmaster@condorcet.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi.xml
index e76de6b3..f57783c9 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi.xml
@@ -1,29 +1,33 @@
 <?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:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
+        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui: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>MIIEfTCCA2WgAwIBAgIQUB8GAq0UqrSAF/D1Yq57fDANBgkqhkiG9w0BAQUFADA2
@@ -53,27 +57,27 @@ H3YX4fNdibt18KEE5w7rXmwJTJwwDxw3UHR3rAcu+PxREwAl22zTk2oSc7DLUMib
 Iw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
+    <OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
+    <OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</OrganizationDisplayName>
+    <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
+    <OrganizationURL xml:lang="sv">http://www.csc.fi</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Janne</GivenName>
+    <SurName>Lauros</SurName>
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>mailto:haka@csc.fi</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net.xml
new file mode 100644
index 00000000..505407b5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dante.net.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dante.net/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T09:32:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">DANTE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">DANTE plans, procures, builds and operates large scale, advanced high speed networks for global research and education.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://idp.dante.net/idp/images/16x16-DANTE.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/80x60-DANTE.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>dante.net</mdui:DomainHint>
+        <mdui:IPHint>193.63.90.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:630:280::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:52.191818,0.133772</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
+						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dante.net/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dante.net/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dante.net/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dante.net</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDqjCCApICCQCOEbOuEI0OxzANBgkqhkiG9w0BAQUFADCBljELMAkGA1UEBhMC
+						R0IxFzAVBgNVBAgMDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHDAlDYW1icmlkZ2Ux
+						QjBABgNVBAoMOURlbGl2ZXJ5IG9mIEFkdmFuY2VkIE5ldHdvcmsgVGVjaG5vbG9n
+						eSB0byBFdXJvcGUgTGltaXRlZDEWMBQGA1UEAwwNaWRwLmRhbnRlLm5ldDAeFw0x
+						MzEyMjMxMTEzMzlaFw0xNjEyMjIxMTEzMzlaMIGWMQswCQYDVQQGEwJHQjEXMBUG
+						A1UECAwOQ2FtYnJpZGdlc2hpcmUxEjAQBgNVBAcMCUNhbWJyaWRnZTFCMEAGA1UE
+						Cgw5RGVsaXZlcnkgb2YgQWR2YW5jZWQgTmV0d29yayBUZWNobm9sb2d5IHRvIEV1
+						cm9wZSBMaW1pdGVkMRYwFAYDVQQDDA1pZHAuZGFudGUubmV0MIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxOW6u4C7wEIQdogPpt/CNjn84HnsdJsadN0s
+						XQQg+SzfJICuxXYGAMDV4k/W9wTGIodOM4Be7O7edGzOdw4RLSJq4vxW5yu4gOuJ
+						yMSYPkEl8nwDOpU4uRTCh2wXE6xe8Eu2eUnXVu+puye4VdKRbQe4Ni1sWgupHO9O
+						+9YWBYkwRN/Gqca9PrPr28nZ+XrX+S/NaSRNwjAHEORgFOUqdcPSztCqq8y2924F
+						dU7PXE6Twh3qx0aEMfKyZGrheuHzSVwb6DC1TMTkY48onXflF84V1CYF9xXbLcSW
+						TZlnzsOW5XbDlQHPEMqFzoyYxfa9zUyd3tNgomu4Ak1t/JO1OQIDAQABMA0GCSqG
+						SIb3DQEBBQUAA4IBAQCTMnPRHLCez8ElwBmqvQaEExeDh4DmPsSnv+M1DdrQ/Da5
+						Bx4xi1lMclBNDMRJ8jTcXDoJAvYkZYAGR1o+doJZrU5dv+JM4QWQsNLVwBJg8gSB
+						ITDrzrpwFUCwVLudO9w/6yDoTbKpyogeMffcGcmiGniKytpI0KK3FhmnFJs+E+0E
+						IA9xqZmnx9NyC2BMTeQqqgKi7wM4Q9oIYk6sbm0a//tsryhXcAjX5GRndGfoKBhY
+						GmwKzvlHvpu3bwazqP56S2ea/AzbBt7s3fsCWTEdWTsCR44JQwvdalxFCvNlEOf6
+						Enuvw8UbosJkAsJVoee8FgQi1WZ/WcIkP0O1hCKz
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dante.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>DANTE Support</GivenName>
+    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE Support</GivenName>
+    <EmailAddress>mailto:idp-support@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de.xml
new file mode 100644
index 00000000..6389209d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-08-10T13:32:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DFN-Verein Geschäftsstelle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DFN Office</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Föderations-Login für MitarbeiterInnen des DFN-Vereins</mdui:Description>
+        <mdui:Description xml:lang="en">Federation login for DFN staff members</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.aai.dfn.de/fileadmin/pics/dfn_small.png</mdui:Logo>
+        <mdui:Logo height="130" width="236">https://www.aai.dfn.de/fileadmin/pics/dfn_big.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dfn.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dfn.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <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
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
+NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+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=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>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
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
+ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
+NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+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=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e15</OrganizationName>
+    <OrganizationName xml:lang="en">e15</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ulrich</GivenName>
+    <SurName>Kähler</SurName>
+    <EmailAddress>mailto:kaehler@dfn.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Raoul</GivenName>
+    <SurName>Borenius</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>DFN-AAI</GivenName>
+    <SurName>Hotline</SurName>
+    <EmailAddress>mailto:hotline@aai.dfn.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it.xml b/swamid-interfederations-2.0/idp.dir.garr.it.xml
new file mode 100644
index 00000000..919cc783
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dir.garr.it.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.dir.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-07-29T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+                            BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+                            DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+                            BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+                            LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+                            X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+                            OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+                            jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+                            9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+                            o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+                            ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
+                            +e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+                            R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+                            XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+                            lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
+                            pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
+                            5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GARR AA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Authority for GARR staff</mdui:Description>
+        <mdui:DisplayName xml:lang="it">GARR AA</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Attribute Authority per il personale GARR</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+                            BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+                            DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+                            BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+                            LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+                            X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+                            OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+                            jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+                            9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+                            o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+                            ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
+                            +e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+                            R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+                            XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+                            lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
+                            pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
+                            5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GARR</OrganizationName>
+    <OrganizationName xml:lang="it">GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>system.support@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dit.ie.xml b/swamid-interfederations-2.0/idp.dit.ie.xml
new file mode 100644
index 00000000..29a3f925
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dit.ie.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dit.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
+NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs8xgb2mE8WJaUYR0fVcH8dEAS7f7bGWpyzrT+SPa
+v5egAD27fcuhUP+QFILf6plDW6YqXBcbymxHE1yPExVYO84v8lfpULEMbii1wRg+
+z/ywHqZ1Bio+aq8OrcCdjrlR84n3fpR/6aaVr21JbwVPR6+sCuc4+q3opXzaGGFa
+LvTT3hcl5C/cGiJQra81rlv9Q1dWwZh6xvmR5wrqzxkKiyJ8mr1KjuePyJV3BOJJ
+zeaki3SYdkB+xM8gO6P19lXkvsVYnkUWVR79E61mFReUWPzr9Bjub0A/aE2Pwzuq
+ZWPedEsVR4NfTZANVhewKCNFDadRDbRFDDRW9W2Lc2v3rwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuZGl0LmllhiFodHRwczovL2lkcC5kaXQuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFF6EGb7A7x+2xLW/hEJHpulkdzkYMA0GCSqGSIb3DQEB
+BQUAA4IBAQA2kPu6oYpbBoldko99FX4ePbXa9ty11/I+EamddnzkAsLWsNd2JLQW
+R9wo+2vSkUzaxck11FMBS5hbqNsKdUjqTtscGP2MfmIiQJG+dgN7ThHKVvaxyTpc
+3JPQIvaew08s7L8ShjCuhkjmYmlOa4olGV1Z0aG7SjSI9b5w3MfDwN2lecAAUKVW
+N2vAFMBh3uxWVlSDbivRfNXflXOMYtDqAG1BPHff1UMArvYiSxxiVwM5tNBxmgZy
+N8bWLtABtkfUyrU6ay6E7h6qReHu30iU46r8xDyZkHjLa6iakvGjobWlTBTAF24P
+mANH8mJhMI+endx1YgUmOJJXylP/VAbC
+</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.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Liam</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>liam.duffy@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracey</md:GivenName>
+    <md:SurName>Roche</md:SurName>
+    <md:EmailAddress>tracey.roche@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dkit.ie.xml b/swamid-interfederations-2.0/idp.dkit.ie.xml
new file mode 100644
index 00000000..13e6686e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dkit.ie.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dkit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dkit.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmRraXQuaWUwHhcNMDkwODExMTAyNTQ3WhcNMjkw
+ODExMTAyNTQ3WjAWMRQwEgYDVQQDEwtpZHAuZGtpdC5pZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANkYoFuj1yxD2P68jA2zsEtokAAUExRcur1pdVIF
+3iTS3l/vifRLxstc0IVniaOcWvBxWcLKLueZeBMTuWsyePGz5BhecXzs2u6alYZW
+ITUxJTE0jxZ+WfpPQqnWsysa4rIzksw9l7sbccSz7qvZPLFlwdprrU1rMAMqAcXv
+hYg5iJLRPfRHMN9piFrlibi0RM+u9QPj8/KqJnYVjDZ1+oMeVArEdLk787YlMp79
+GaiKbP6u1cJ3FIgtnWmtph4XWhdMNoh3VBVIo30LnxANGSotMEo+pz/UphUarBjF
+wUzy8vyJdF5+L/Lh/3q6JKVIViC064jQe+PsSJYG0R3ynVcCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmRraXQuaWWGImh0dHBzOi8vaWRwLmRraXQuaWUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHrvvvBubZqHTcyxZa3VdPhPDWX3MA0GCSqGSIb3
+DQEBBQUAA4IBAQAPn2bTK88XJI8cyWVVRvKXQuNTwIY3KLE+dRs+6EGeF46Ipzfn
+fGIF1je7IrsIUAIKs+8KBWoCwoOp0Nasilib/F90OK6NwEXNKqGdwZXQxJLdvOK7
+yHOXKS+J27t05krcLbutSwcNdnOVEdWbtOz7+/qbx2CSxbrOIDSgTcVDwn/wqm7G
+QW48Aoz0QReQV0oYglj3D9zNUfpnshQqcv45i9+toGTLTdkQfFm/4DUMEWQXM/IE
++hxh2RRIl0wE/qVYfd5hahptuNWfhjSbTtUB4iPaY18z1TMG3JfgQvtKszQeHRa9
+LKIUf4wMQHssUFNv5TXV1zu1W4f9ctYYLexH
+</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.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dundalk Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dundalk Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dkit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andrew</md:GivenName>
+    <md:SurName>Clarke</md:SurName>
+    <md:EmailAddress>andrew.clarke@dkit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Scollon</md:SurName>
+    <md:EmailAddress>paul.scollon@dkit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
new file mode 100644
index 00000000..19d446f1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ed.ac.uk/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-10T09:51:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Edinburgh</mdui:DisplayName>
+        <mdui:Logo height="70" width="315">https://idp.ed.ac.uk/university.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:55.9213,-3.1726</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
+						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ed.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDGzCCAgOgAwIBAgIUaNzLeqDgCpvqZ+xdntpj4UryL9AwDQYJKoZIhvcNAQEF
+						BQAwFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMB4XDTEwMDYyMzE0MTIzNFoXDTMw
+						MDYyMzE0MTIzNFowFzEVMBMGA1UEAxMMaWRwLmVkLmFjLnVrMIIBIjANBgkqhkiG
+						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RXQWoMfry/rRwfXVCxnRdkS05zIfHerw0/c
+						ObSFOORK8zOShk1QKuv+TevSZFJgD+iu96A1s55q6k0ZtbpW1iKzTAbHLXikt0yT
+						GYg5th2Gp3PqBFdzChse1Sdk8exRou10yOGZaqCyfG61u+BRgdEzefdG6to7PpG4
+						BNWD1njtO6zDl/zzsX9DiV3Kc7Fuo6P7ak+XPHGxztXVNwDRSoKZYiM5K11dpGvG
+						nhyhL2gbIO98AzGMELdkurTf4EYXuELGPY836NNdzhBEZ0Mo+g9EUqvPQ8inFOT4
+						TloSEUtxUzLr530YPOezm55QCDjH7JIS4rc+G4rN1B7b1zTybwIDAQABo18wXTA8
+						BgNVHREENTAzggxpZHAuZWQuYWMudWuGI2h0dHBzOi8vaWRwLmVkLmFjLnVrL2lk
+						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmHZOct2bza0v07qT/d1ATgFYrajANBgkq
+						hkiG9w0BAQUFAAOCAQEAEgOOXyutNIWNlWoDj3VKfkZFDpw/2qvrP09EaYGBCwZ+
+						NAmPHWtN+3jlDxfnYBwhTAaCWlZBqfhk4JObVH2Q3xu08zWEHBqo4fr/YGYYWAGp
+						nZ29epYGOJAYbuJcWwwMJ4onFHyygRgmec4xPnz53noB8h6VEMmfP77y0JzZIF86
+						+1icvTyJg4ydkh8iPir4WwZzuP7wj+cPb3uyNTGSusxhghVoREkGIG2YBwgp3cyv
+						zqrzhKEksLsrrxs4mtHKDUDPSS1iArA4OJHFoIqEBMg8UOQFY4FA/FV4BDd6L5Z/
+						u0zH2B9Z0UeGRg5ivQYSOQ9HLX2IeDCQWhcJC33ibQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Edinburgh</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="gd">Oilthigh Dhùn Èideann</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IS Helpline</GivenName>
+    <EmailAddress>mailto:IS.Helpline@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>shibboleth@ed.ac.uk</GivenName>
+    <EmailAddress>mailto:shibboleth@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 0734d501..1ed38243 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,324 +1,333 @@
 <?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">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">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>
@@ -328,10 +337,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>
@@ -339,8 +348,4 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
new file mode 100644
index 00000000..138a4ae5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-rosenheim.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-17T07:15:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Rosenheim</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Rosenheim</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Hochschule Rosenheim</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the University of Applied Sciences Rosenheim</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-rosenheim.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-rosenheim.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.fh-rosenheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.fh-rosenheim.de,OU=Rechenzentrum,O=Hochschule Rosenheim,L=Rosenheim,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
+Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
+MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
+6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
+C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
+xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
+obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
+bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
+iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
+cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
+BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
+Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
+NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
+nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
+7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
+/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e360</OrganizationName>
+    <OrganizationName xml:lang="en">e360</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Robert</GivenName>
+    <SurName>Meier</SurName>
+    <EmailAddress>mailto:robert.meier@fh-rosenheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Robert</GivenName>
+    <SurName>Meier</SurName>
+    <EmailAddress>mailto:idm-support@fh-rosenheim.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
new file mode 100644
index 00000000..beee4668
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fzu.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.fzu.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">fzu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
+        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
+ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.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">fzu.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
+ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.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>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Physics AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.fzu.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.fzu.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.georgikon.hu.xml b/swamid-interfederations-2.0/idp.georgikon.hu.xml
new file mode 100644
index 00000000..4e861d97
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.georgikon.hu.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.georgikon.hu/idp/saml2/idp/metadata.php">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">georgikon</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgikon.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPFqC/HfYvfScTLOiI/sKofsx6MWMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEGlkcC5nZW9yZ2lrb24uaHUwHhcNMDkxMDAyMDgwMTA3WhcNMjkxMDAyMDgwMTA3WjAbMRkwFwYDVQQDExBpZHAuZ2Vvcmdpa29uLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgR/NrpE25snvbNy6ICQJHqjtGmFkHIXkVeQPso1xTGO/K0uyNSGuUMWObwm5zAhxINLd+8u52noWtXPcngiFQXp8x1+k1PPZKrhlw7Lsmt5/WYFDkPxdZ90PCpQkpRgRQwBvmnwSdlqGmp/ts7ADTzh6ih++pvHI0jgyy3mMyJg/w3psv6VwNF4YuYY8rUQuPhNYVS7EMrebWlPOttqetcuXyTgZrx9O8W4GpsepmIJHBTlqY85W0H4zFXfUk2+t7IeUkDuxE474JPU5IszmVIfm5suEh1rwDnwKP+wRi5htuxdrbs1ceDrRxkbpDinoLcudn5XGq6LvokUI9HwQHQIDAQABo2cwZTBEBgNVHREEPTA7ghBpZHAuZ2Vvcmdpa29uLmh1hidodHRwczovL2lkcC5nZW9yZ2lrb24uaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZzriItWOd2JgNAOtHivus73YOBMA0GCSqGSIb3DQEBBQUAA4IBAQBDovq/Xvd+cFB8KbgCF0Prd3WqhQx+8StGsxZLr3vVwxZYJucnpIpvKXJHj/9kQx2MwunTxlq9zvuyPbHIdnAt46x1tbYVRlyBaQXJQYRfaXeKRBNoO1lm1matIaXT8zaeBncF13S4vL0GcjKAR5bbvCVvdjjrTh9AH1p2g70k58PoW5rbGMshlgZs5Ibcp8EH6BXg3uqOJcZe1kQ6gt3io6iWRRKvaNNdcnqfBFpyP1OXwX64+APWbcGYw+RDMvzoDKi6rikDz6f67v3bI4H+X05T9d9Ijs2cKnI3l6aT1EgTD7EKbo7UkoRIe15g8kZ1Gq+ItOJsNOG820hN1UTJ</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.georgikon.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SingleLogoutService.php"/>
+    <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-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">Pannon Egyetem Georgikon Kar</OrganizationName>
+    <OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">Georgikon - Pannon Egyetem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Georgikon - University of Pannonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.georgikon.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.georgikon.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Héder Miklós</SurName>
+    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Héder Miklós</SurName>
+    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Héder Miklós</SurName>
+    <EmailAddress>mailto:heder@georgikon.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.heanet.ie.xml b/swamid-interfederations-2.0/idp.heanet.ie.xml
new file mode 100644
index 00000000..68a3f5fe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.heanet.ie.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">heanet.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">HEAnet</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://idp.heanet.ie/support.htm</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLmhlYW5ldC5pZTAeFw0xMDA0MzAxMDU0MzZaFw0z
+MDA0MzAxMDU0MzZaMBgxFjAUBgNVBAMTDWlkcC5oZWFuZXQuaWUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzASQpsLEEYKVuaK9JiA66mzcCkx1X50SO
+uEtaPBejFzRZ3i5j7rgE7m+2ku+kjt8JJg9JUOrdnKJ0S/9aVggpKQvDAo9rNvjO
+/dyNge4OfUliuSUHw+LOiyxH0ELMW7DTVknLimzZNlHewmunUD/c/uI54Zb8XGYd
+MpmmfPq7LBeurCxBDZ101ujdj94lvtGTPY2WcnBj3ILoyAd1CquGU4o66ws333Ht
+7vA/NTLIO40qQSvEsMR9Lyb/ZQR+XmcssoJ8TqC6lWf2FfAt4phX904FBB9CHapZ
+dtHRRl6r1AifH9NZ/uh24+ct736MY5eqLyy5C5Wp0GmGac33+Iq5AgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5oZWFuZXQuaWWGJGh0dHBzOi8vaWRwLmhlYW5ldC5p
+ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEdkRl4cvkY8kAeuxgl0TK1i61Mw
+DQYJKoZIhvcNAQEFBQADggEBAKk1EPv3OYkfuvz8js6xl7fI31jPJhDao2yExaeZ
+8P3joqz4YwGmI/Ahm+HNGtqYEXvP8MUpO8yPkkiuJl7L9pHu0Wk2v026XO1B2fZX
+z/4PHuTzo+cpPkcJewzDMKQuNMINzx0gOTpXH2WsSVaHEFBXm0g2OUkk8p4vnY5o
+O1D15tXmi7abFTXObJbvnNrQZJ4+wZAk+wGIfjEd5uKGIMgxET35RJLoUcgQnVxe
+Z0nveWuA2Iu/d6B+48I2J+I0vto6XneJrsVIt8MovKtbjFRs0fAZoD+UtthT+ZVz
+rbgeIIersVLLyLj9SIJrC+FVbLzD3jRnEI4r+mqAxzVNprk=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/logout.jsp"/>
+    <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.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HEAnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HEAnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.htm</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Glenn Wearen</md:SurName>
+    <md:EmailAddress>glenn.wearen@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Janusz Ulanowski</md:SurName>
+    <md:EmailAddress>janusz.ulanowski@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc-middleware@heanet.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
new file mode 100644
index 00000000..de865cea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hig.se.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hig.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
+        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hig.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
+        <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
++eeRni4ggtByVTzg9fALQjDJydWcw0Oy
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAKDMK5kO5prtSxBh3prGd9azJDLHMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5oaWcuc2UwHhcNMTEwOTE5MTAxMzEzWhcNMzEw
+OTE5MTAxMzEzWjAVMRMwEQYDVQQDEwppZHAuaGlnLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAlS0UltW/Niciy2s+KZOXcxBUBhRIwIltiARUzK8l
+/HHgfhDVadKCF6jFS8kYvWSTPGJbPQVtk14WXapOOlSFiUcDAI7JxN4G7wLJZjPc
+VUBIfedZYwzsTGc3XlHYOn6nBGBYIqG/OPHDA39khu/DiMVBoC4iXX7dnKIyLHXX
+ucuhlB3XpBajgzgkPTjp8kJbI0EeTtHn2JenpogOy8+I8mnEveL0p8WWuXr2Ij63
+/+ePtc49AQgEXMgTusGfhQZNqR016I9P32ycF49t4S0Ur2hkv7gm9qL8RwWFN8jH
+YonG4K5Xc7O4T6Q60e+/PDdyf5Po25O3im+aTPMzkEIqwwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaGlnLnNlhiFodHRwczovL2lkcC5oaWcuc2UvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFNkNbupRD08lWx3ys8A/KEqKGJtDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBLzzCPKLm+PSGXcyFoM13yGUzhaATV3x1aABalp73Ps22j2BZay5Xq
+exByQFZFJoU279mh6CLTDch679S9WyI0WxQM41jV5mYOv5mllRLEiKMTG3slyyQN
+8P7rBL5OM2DusxFHCCturTlDjnafpybukqOd/YlaRoGeZuhQnzmxx0si07C9pwN4
+SdzIT7rVQJAvwjSNWMoepX0tboWAHFTdbvxEstnlFyi6Vibw5oTy34UxXVP2EmA8
+otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
++eeRni4ggtByVTzg9fALQjDJydWcw0Oy
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">HIG</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Gävle</Company>
+    <SurName>Network Operations</SurName>
+    <EmailAddress>nat@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Gävle</Company>
+    <SurName>Operations</SurName>
+    <EmailAddress>nat@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Gävle</Company>
+    <SurName>IT Support</SurName>
+    <EmailAddress>itsupport@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
new file mode 100644
index 00000000..5d62e2c8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-12-04T16:29:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/bwidm-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Hochschule Esslingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Esslingen University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
+        <mdui:Description xml:lang="en">Shibboleth IDP der Hochschule Esslingen innerhalb der DFN-AAI</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www2.hs-esslingen.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="89" width="210">https://www2.hs-esslingen.de/rz/images/he_logo_gross_dfn-aai-metadaten.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.hs-esslingen.de/de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hs-esslingen.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+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==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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.hs-esslingen.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/SOAP/ECP"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+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==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.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">e192</OrganizationName>
+    <OrganizationName xml:lang="en">e192</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Hochschule Esslingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Schmid</SurName>
+    <EmailAddress>mailto:admin@hs-esslingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>HE AAI</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:aai-support@hs-esslingen.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch.xml
new file mode 100644
index 00000000..29c9efea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hslu.ch.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-14T15:12:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">HSLU - Hochschule Luzern</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Hochschule Luzern</mdui:Description>
+        <mdui:Description xml:lang="en">Lucerne University of Applied Sciences and Arts</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAADVJREFUeJxi+P//PwMlmCLN1DHAxcXlPyV4OBgw8LGQNnPmf2LxcDVg4GOBUgMAAAAA//8DAA5inxcVtjGTAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAt8SURBVHic7JmHV5RXGsbzz2Sz2c2m7e7ZmE1MTGJiw4KoUYMtRhHUYIkxqFEjRqOigEBAaSIdpAxlaENvAwxl6L333ssMsr/vu2RETPacJEpykPfcM+fO+917v/e597lvmXlh5jmTF/5oAxZalgAvdlkCvNhlCfBilyXAi12WAC92eV4Bd/f2dfX0/qqZja1tE5OTTW3t4xOTQtM/OPRLgweHh0fHxqZ0uicfqQu0AQrlr3r175FZwLmFxXlFJUPDI02t7XVNzZW19dn5RTUNTbEpGdX1jZl5BblFJdGJqe1d3clZuQUl5UyJTEjuHxiMT83kUWRCSllVLZ2SyurGljamM7GqriFNrQFPUVmltrwyIiEZZUVNHQN6+wdGRsfi07JKq2pc/YIZ+QcAVudrG5pbMSIsVuUTGjk8MuoREBoYEROlSgF8VGJKem6+d0iE0z0/xjAF/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv5BCa2zr4TEjL4uSZwmmDJEtTiJ5WXlNH6+zuzS0s6ezpjU3OgCyMZFMSM9Rl1bV1TS0ZufnFFdVsx4zMf7YDXlTU1HM1Fhrwggm0HxhauPN8Uh4Bfvjw4ZOPcTPT09NzNXzV6yXN8Ogo9/D3W8ArxKt/1oCnLo8A+yuUEA92tXV06fX6nr5+fBIHkl9Sho/pGxicmJgcG5+IS8mAwDx1838AY3HRHd09dHiEq9fp9XxCV6xv6+zS6XQGpU520WJZBrd2dDGGZXEZo2PjPPINi6qored6MxF/MTY+zqynvguzgDHC5s694Ki4tBwNTghHhS/hE/ebkJ6lSs++6xuMBhflFxbFbcSsiPhk/BwDcOOpag0XEm/EgMDIWDDgwHDO+HAmKuKSvILDCQHtnd08EisHRcbGyV7NK1jBauzpDRfPEGUCFx4b7j9Q4NU4g8mpqWcCmHewqfgtv/DoSHCqUgIUMVgfm5KuysjGMnf/kKKyivDYRMY0tLRNTelyCorvP4jAxNrG5pTsPEV8EnMLS8tzCrUZeQXo8XwS/ogYzp9HODwAM90/XCnFp9p6toz9CoiI0en0OL+M3AJ2PCw2sbuvXyzrERiKF3wmgAdlRwIMQk5xRRVfeXFf/wAXDPrB8K6evsHhEWJVa0ennms8PU0Mg3U8hYFiDI/ILiYnp7gXnAzM5xMlVx2XLm5+Z3cPrIbDvIsmJTy9fegFqxkPEaAxB84wcqFnRWmDsNl88hIu3tN9059Entdc+vmRJcCLXWYB77K0+ubKLdwm/fLqul2W3xgqGGLP1kMntluc3Gp2/IKNIwmW0OcXl+0+ZvWpuaR38PQVRaK1nfOtu15iADH24OkLeF36eN1T1je2HjrOeBYnbgn3i5c+8d011ucRA8hhUBKrLc5YC79NLNhtaUXgoE/o2nfiXKdcxg4MDn1x6rwqQ02fRAD7iXMGVNkF2m3mJ/YeP7vj8FdYLtpjgF9eYbRujznBhD4R/6/vrwMPfeLhqys3sRc2Lp5XHe++tX671VVbYce7xrt2fXna5o7neRuHf6/dRhmIfueRU+ZnLok1PQND0ZNLEbHMTl9csWXvDWcPxpsePb3d4iuSDYLQ5yfPfbht33Vnj+s/urMgG8dEp/v+b2/YKXaK6uJvK4zIEWbkgvS1lZuoSegTzP65eou/XEhTrmJ/nrbUAJjT2nfi7OsfG1+yc8Zy0R4D/NrHxpv2HxUnzExAiqL3ku2Pq0zNDAtdvOlktMecDknCKx+sp5oVepIEEWY586Pffv8TNRRvb9xJmkm4Xm5sClShn56WMsoZuWB6e8MO6mGhpyYTIF18At8z2U3Mp08thd0U5DNyQfqvNVsJ74Ia7D5ZHf3C0grs18gnZBBo8pbRdgMf51P6zVUmb63fse3QCSi3ft/hNz7ZTM6E/vvbd9buNtf99EvFJVvnjZ8fkdlVxGZT681b7sCp88vW72CRTy1Orty+f8XWvaBiH6H9G5+YrPrsINw7e82etBnGksm8a2xKTj5vkbt+wa9+tIkprMMx8KLMvMJfC5iU7h8fbTQ5eGzzAcsLN53mA35jlcn7W/Zc+9Gdczh12eb1OYDX7bHQ/5SEXLZzmQu4tKp2nq37T55bs8uMRWjQlYMSh0nOREJOfsq7Pzt6+qX31lJvw2oAewSGzAfsGwxdrzjcZZEz1+xeW2k8FzBVx4zkFPqXbfh/gMlSOTZrexdABUQ8+gnpEaWNv/hS9LXllQZKW9u5rNi6b3hEYhpu5ivrG0Z7LGTAhS+/vy5TI9nBVSQrHhiSftCC0scuXBXrUGZAaQAzMTU7r6OrW+jJyblyZO8AXrZhh8HJJWflCk8Jpdl9cb/qGlsMlKbkeOXDDZR09OubJH2A/FuCAJwvG2wQihO49ouU/svytWtMzYTTwv28+O4ajewD6C/bsHO1qRnsMjlgybquvsHyBg/sOHwKPOiN9lq8/vFm4TNgMv5JrMl5vrnaRC4Gx7eYHf/vxs8kqpuffGeTKV9F6ceGwiauEgT++wfr7/gEMdHxnt9/jD4dHJJ2ubSy9qXla9NzNDPyJWe7l2/exSJclk92HqBum5HjBV4WpysZedDy5KXrKClaXnxnNXwWL6U9BvjmnXueQWGCulwSuETSLx6x3DUnN4hx1dE1PC7RsFUk97c9fH9wckOfptYIJW4TbyH6edoSvC5oxZq2rveldZzc7N29RfiZkTN2n9AoVqAxV2TyWflFTl7+E3Kco1rCNoKCGM86t1y9eCkW1jU2CyUkhyaEAGGke4B0R4hk153daShFewzw8yNLgH+rPHxCntbKT1dmAV/zj3NTZurn/F43ODpuE5SgrW0RX/0Sc4NTpHSnqbP3so/ye58Y2hXfmKt+seVNUmB0iUy74idprL2jL3lHX/FV9g2NNnf1XfGJsQmMR894a29ltLpEvKWho5e5rtEZXGM0zhGpGSU1CwfY7JbvRa+ouUU/5h62D8gonjXCJij+dmgSnZ7B4dD0wrD0QkVmUWCyhom5FVIsideUf+kQeCtYFZGlpUVmF4+MT/YMjjgrUi3s/HxVOWEZRd4JanM7P01VI+PLG9uZe/Cmj7ZO2lMrt7DIbO3CAT5s78/2zwNs6RiUWTKbWtg+UDmFp8ydOanTKTK1X9h4F9ZI3pJTsnINi80tnXlciutaj94OGJIrgSm9/rhTsCq/gn5FU8cxp6DznhGOYcnMPeehiFYXPzOYj+S3AMbuVG018I47BUWpiyfkDGF8cupbj4iv74RC6e/uRzV2zv74xnZY2Ps7hCa7KzMdwpKP3A4orW8TgAV4Fqlu7bp4L/JPATirtE58tQtJFIDbewd/8I9lvHe8unvg0X8IAD7rrmBfIrOKoXSvnDYIwAzmOlg6Bh51CMitnK06AczJt3T3c8PdlBkXvQBcstCAp3T6h/IveAIwBsXllT2U/hzQ43XgHvrkoqpDtn7cQDHR4IsB/M3PUbqgupl1BkbG1OX1vCWrrE5MATCn3dU/lFfZyOWnKXPmz30WMgv4iH0A1OLocNeXvZXJhVXcK6+4bI4FDSzltPOrpf/QUoqqzG39UIqG7y1raBeAz7gpoLTkkH1jfvCLFeefXy2dcGe/lGkHp+bjtDxiMgVgqN7a3T+p08Pn/TfuK9ULCJhbh5f+1jOCJh1UnlR56PTTvok5Vm7h5zwVebJrRXIqGs56KMRImpVreJEcurDbMy7TLkRFsw1R3Q5L6h2Uk+GGNlbukftcfq6G8Pa1bd0X7kW290m1VGxu2dd3Q1OK5hebzxDw8yNLgBe7LAFe7LIEeLHLEuDFLkuAF7ssAV7s8j8AAAD//wMAz8BziTNWkGsAAAAASUVORK5CYII=</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://english.hslu.ch/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="de">http://www.hslu.ch/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>147.88.219.232/29</mdui:IPHint>
+        <mdui:IPHint>147.88.220.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.221.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.218/31</mdui:IPHint>
+        <mdui:IPHint>147.88.222.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.224.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.225.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.226.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.228.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.230.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.231.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.232.0/22</mdui:IPHint>
+        <mdui:IPHint>147.88.236.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.237.0/24</mdui:IPHint>
+        <mdui:IPHint>147.88.217.220/30</mdui:IPHint>
+        <mdui:IPHint>147.88.217.224/27</mdui:IPHint>
+        <mdui:IPHint>147.88.238.0/23</mdui:IPHint>
+        <mdui:IPHint>147.88.218.0/25</mdui:IPHint>
+        <mdui:IPHint>147.88.240.0/21</mdui:IPHint>
+        <mdui:IPHint>147.88.254.64/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.72/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.80/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.96/29</mdui:IPHint>
+        <mdui:IPHint>147.88.254.112/29</mdui:IPHint>
+        <mdui:IPHint>2001:620:110::/48</mdui:IPHint>
+        <mdui:IPHint>147.88.218.128/25</mdui:IPHint>
+        <mdui:IPHint>147.88.219.200/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.208/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.216/29</mdui:IPHint>
+        <mdui:IPHint>147.88.219.224/29</mdui:IPHint>
+        <mdui:IPHint>147.88.0.0/16</mdui:IPHint>
+        <mdui:IPHint>147.88.216.0/26</mdui:IPHint>
+        <mdui:IPHint>147.88.217.0/25</mdui:IPHint>
+        <mdui:DomainHint>hslu.ch</mdui:DomainHint>
+        <mdui:DomainHint>hochschuleluzern.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.046681,8.314912</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.013434,8.305034</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.174274,8.512537</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.060845,8.322106</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048388,8.309762</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.048096,8.314655</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:47.054246,8.295853</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
+MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
+hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
+S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
+5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
+bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
+fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
+9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
+0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
+vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
+wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
+p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
+OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
+gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
+bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
+BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
+y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
+0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
+sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
+GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
+ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
+AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
+L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
+c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
+ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
+BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
+aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
+DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
+o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
+J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
+R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
+A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
+CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
+moKY92W4xbV9VFcSbg==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hslu.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
+MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
+hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
+S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
+5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
+bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
+fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
+9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
+0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
+vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
+wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
+p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
+OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
+BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
+BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
+IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
+gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
+bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
+BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
+y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
+0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
+sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
+GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
+ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
+AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
+L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
+c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
+ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
+BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
+A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
+VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
+aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
+DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
+o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
+J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
+R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
+A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
+CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
+moKY92W4xbV9VFcSbg==
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">hslu.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.hslu.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hslu.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Hochschule Luzern - IT Services</GivenName>
+    <SurName>(Hotline)</SurName>
+    <EmailAddress>mailto:informatikhotline@hslu.ch</EmailAddress>
+    <TelephoneNumber>+41 41 228 21 21</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Hochschule Luzern - IT Services</GivenName>
+    <SurName>(AAI Technician)</SurName>
+    <EmailAddress>mailto:aai@hslu.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.icpf.cas.cz.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
new file mode 100644
index 00000000..56897e44
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.icpf.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.icpf.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">icpf.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
+        <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
+TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.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">icpf.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
+TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.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>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.icpf.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.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
new file mode 100644
index 00000000..b5cfec63
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifal.edu.br.xml
@@ -0,0 +1,100 @@
+<?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.ifal.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">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifal.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifal.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.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>
+      
+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
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.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">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Educacao, Ciencia e Tecnologia de Alagoas</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifal.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Adriano da Silva Araujo</SurName>
+    <EmailAddress>adriano.araujo@ifal.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br.xml b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
new file mode 100644
index 00000000..18e5cdfc
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifap.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFAP - Instituto Federal do Amapa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifap.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifap.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
+SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
+YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
+LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
+KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
+BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
+dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
+EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
+e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
+KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
+QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
+MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
+PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
+tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
+34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
+IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
+BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKzApBgNVBAoUIklGQVAgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAKBgNVBAsTA0RUSTEoMCYGCSqG
+SIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVkdS5icjEQMA4GA1UEBxQHTWFj
+YXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQGEwJCUjEYMBYGA1UEAxMPaWRw
+LmlmYXAuZWR1LmJyMB4XDTEzMTIxOTE4MDIwM1oXDTE2MTIxODE4MDIwM1owga8x
+KzApBgNVBAoUIklGQVAgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBbWFww6ExDDAK
+BgNVBAsTA0RUSTEoMCYGCSqGSIb3DQEJARYZbWFyY28ucGFudG9qYUBpZmFwLmVk
+dS5icjEQMA4GA1UEBxQHTWFjYXDDoTEPMA0GA1UECBQGQW1hcMOhMQswCQYDVQQG
+EwJCUjEYMBYGA1UEAxMPaWRwLmlmYXAuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6lU1vl2shAmZ5lk9mqgLW0fGHYgMHSqS2gQqaTW2KfAo
+e6wvyEjkmFa2KTTa7gmTjBQBGahHpKjrTpMd1FEqMC1Eu9lLlStVvUjqp23DLdwI
+KzNcR+SnvPKbPWI6168jZlE5ymytgF7wUsJj9PB77i9FpJ8kZgky9iZhHCsBp9Ad
+QVFznpEGn/pwmPwtXEzQBFdwSqXdkUpISlHPe5dBItnNx6Z8YCEcBA+IzOL38By8
+MG8LMbziCPQpQ7TgXiEE5vLsocJw/UF5DiWqSZ+nZ/GLwXx5rkbaB8wQZen2v0q+
+bghS7nmp3hKAsYKNTlw0jPxji/nitm5nZSReDv1DgwIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQCj9QDb4QEUtzeU527JnQqF8DGTV275Px5iJWm3+pyv1ScYcJ903JyQ
+PNxPh+WdRkAxBcCMbd1vH4toAVZX6EDMlJv/H9x/nmnWTl+GigzLz4vAOREaab15
+tQPwipCRXVnakkVxYk+1QWrmXyzZPaw3dOLVOg/SSTVk87vnhuX1nvu2r7ZVNDZv
+34WrTP8bVJd5c8yIMuvCMBPp30p4A8NGm1PkZP+OIH5CVO25cNSVq66/OeCSr3Se
+IckFRapAp4rc+PDyWiwSM6Xy8kM9pdraxGWoW0697si+Ji4MsIdah9I7+C6B6XB2
+BoOuGlC2BFe2rK9IG4bntSohpeIVUoLF
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFAP - Instituto Federal do Amapa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifap.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifap.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marco Pantoja</SurName>
+    <EmailAddress>marco.pantoja@ifap.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br.xml b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
new file mode 100644
index 00000000..9590a99e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifc.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">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+        <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: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
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifc.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>
+      
+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
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.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">IFC - Instituto Federal Catarinense</OrganizationName>
+    <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>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Renato de Souza Muniz</SurName>
+    <EmailAddress>infra@ifc.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
new file mode 100644
index 00000000..5ae2df2d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifpb.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifpb.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifpb.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
+NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
+LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
+ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
+feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
+SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
+Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
+hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
+Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
+NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
+cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
+bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
+UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
+AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
+NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
+8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
+lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
+I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
+LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
+ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
+feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
+SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
+Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFPB - Instituto Federal da Paraiba</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifpb.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifpb.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jose Hermano Cavalcanti Filho</SurName>
+    <EmailAddress>jose.cavalcanti@ifpb.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br.xml b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
new file mode 100644
index 00000000..6eb22eaf
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifto.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifto.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifto.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
+BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
+MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
+MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
+KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
+EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
+ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
+7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
+EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
+YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
+xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
+ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
+HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
+6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
+sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
+2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
+p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
+LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
+Lqis4w==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
+BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
+MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
+MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
+MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
+KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
+EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
+ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
+7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
+EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
+YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
+xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
+ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
+HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
+6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
+sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
+2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
+p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
+LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
+Lqis4w==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFTO-Instituto Federal do Educacao do Tocantins</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifto.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Ronaldo Vasconcelos Parente</SurName>
+    <EmailAddress>parente@ifto.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br.xml b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
new file mode 100644
index 00000000..15ce2401
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br.xml
@@ -0,0 +1,109 @@
+<?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.inpa.gov.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">gov.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+        <mdui:Description xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.inpa.gov.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.inpa.gov.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
+BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
+MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
+DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
+MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
+cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
+em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
+5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
+bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
+7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
+OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
+fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
+oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
+QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
+BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
+fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
+ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.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">gov.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
+BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
+MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
+DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
+MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
+cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
+em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
+5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
+bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
+7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
+OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
+fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
+oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
+QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
+BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
+fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
+ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.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">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
+    <OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.inpa.gov.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Paulo Henrique Cardoso Maia</SurName>
+    <EmailAddress>paulo.maia@inpa.gov.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipa.ie.xml b/swamid-interfederations-2.0/idp.ipa.ie.xml
new file mode 100644
index 00000000..ae799c6e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ipa.ie.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ipa.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5pcGEuaWUwHhcNMTExMTI1MTczNTQxWhcNMzEx
+MTI1MTczNTQxWjAVMRMwEQYDVQQDEwppZHAuaXBhLmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtRddMdHqEdiL5NPjnqqt4VZZtuNNq1xslTEzOoKW
+4fJ7uKbxw0TOnUVgeqoBJEIVhxDvilQXkonb+jDCFZCbyrNsh/ENr0bbqtOwvMYP
+Q4ODxnxK4D+Qjbf/Ld0ki0jjUvZ8v9J6aO2AKk6IPVlvwXi1GoEGy2Ds46DVq3Gl
+V54v/cu6A8vatOpRgF3keOkL1nLW37mjiy9Xu7+8/C5uK+UBzjb/bX5qzjbHbVOG
+hnamqwgRN0QyzQPU1OyNK4b88DIw+gqUi0qo2tlcc+Hn6He3O56uSsTprNwoNKrr
+MvlkEL1pY0lfgAcadJGGrQ9FEi0Ty+GeeyoT0agvHlq0jwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuaXBhLmllhiFodHRwczovL2lkcC5pcGEuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFJhKeTQ7ebYvmIRcYtOY8b9L1zhaMA0GCSqGSIb3DQEB
+BQUAA4IBAQANi1lNeUhqvdVK7q7dotF3EPg6C2PJLYUXjInHfHKLHbDDfYGEVf19
+nz2pasKmdfo0bv9kssbuwVfn7tUro8Igdt661gq/0/eriKaMg83qeo5MOoJa0I5t
+94y8/mZAhz3SUReGR3zEhbZIXEx+zdbbz992k6FjMCi4MQpfoN1LD6uqIHqjAu0P
+A2dPT+rM2JRZ/li0YmTLUcvE0IP1q7VuihtEXBKbndKPe4sEIy4LVfpPDs2oYjg6
+0VDwE1ENoiu+3TYEkP/ZZpu2Z68FG7Ygpedl96CjXFm5qufuU8UUpz7SRMf2gEv/
+NkaVXN/aXmq6gSQ+gfVeKU+eqHo2TR51
+</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.ipa.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipa.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipa.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Public Administration</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Public Administration</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ipa.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Sisk</md:SurName>
+    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Sisk</md:SurName>
+    <md:EmailAddress>psisk@ipa.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se.xml b/swamid-interfederations-2.0/idp.it.gu.se.xml
new file mode 100644
index 00000000..55d4a223
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it.gu.se.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.gu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Gothenburg</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Logo height="50" width="344" xml:lang="sv">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+        <mdui:Logo height="50" width="376" xml:lang="en">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>gu.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
+MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
+wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
+L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
+Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
+9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
+KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
+hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
+jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
+V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
+MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
+CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
+MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
+MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
+wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
+L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
+Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
+9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
+KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
+hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
+jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
+V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
+MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
+CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
+MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">GU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Gothenburg</Company>
+    <SurName>Lena Ström</SurName>
+    <EmailAddress>lena.strom@gu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>University of Gothenburg</Company>
+    <SurName>Pablo Millet</SurName>
+    <EmailAddress>pablo.millet@gu.se</EmailAddress>
+    <TelephoneNumber>+46707104070</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Gothenburg</Company>
+    <SurName>GU-Support</SurName>
+    <EmailAddress>support@gu.se</EmailAddress>
+    <TelephoneNumber>+46317862020</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se.xml b/swamid-interfederations-2.0/idp.it.su.se.xml
new file mode 100644
index 00000000..d567ea44
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it.su.se.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it.su.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Stockholms universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Stockholm University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
+        <mdui:Logo height="110" width="127" xml:lang="sv">https://idp.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
+        <mdui:Logo height="110" width="127" xml:lang="en">https://idp.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.su.se/regelboken/bok-3/teknik</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.su.se/rules/book-3/3-3-technics</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>su.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
+MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
+OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
+5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
+PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
+7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
+HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
+hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
+kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
++AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
+zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
+nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
+VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">su.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
+MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
+OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
+5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
+PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
+7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
+HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
+aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
+hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
+kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
++AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
+zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
+nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
+VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">SU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Stockholms Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Stockholm University</Company>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Stockholm University</Company>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Stockholm University</Company>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>helpdesk@su.se</EmailAddress>
+    <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
new file mode 100644
index 00000000..367186d1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-13T10:04: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>
+  <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">fz-juelich.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Forschungszentrum Jülich GmbH</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity-Provider der Forschungszentrum Jülich GmbH</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.fz-juelich.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.fz-juelich.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
+MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+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
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.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">fz-juelich.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.its.fz-juelich.de,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
+MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+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
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e234</OrganizationName>
+    <OrganizationName xml:lang="en">e234</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.fz-juelich.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Jens</GivenName>
+    <SurName>Heidbüchel</SurName>
+    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Jens</GivenName>
+    <SurName>Heidbüchel</SurName>
+    <EmailAddress>mailto:j.heidbuechel@fz-juelich.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>ITS Service Desk</GivenName>
+    <SurName>Forschungszentrum Jülich GmbH</SurName>
+    <EmailAddress>mailto:it-services@fz-juelich.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie.xml b/swamid-interfederations-2.0/idp.itsligo.ie.xml
new file mode 100644
index 00000000..d5559cd4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itsligo.ie.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">itsligo.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5pdHNsaWdvLmllMB4XDTExMDcyNjA3NTc0NVoX
+DTMxMDcyNjA3NTc0NVowGTEXMBUGA1UEAxMOaWRwLml0c2xpZ28uaWUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQz7PoJrvZxLSnvg6ZaRmqMStCmR5w
+6i3JklsDuILt/HaYtlKpbZtjb5j86rgDcyp2CK6YNm3k7xn/9nfScn/LnGKSW87r
+lwiSXePGAJ2OgCbVks+bQQIO4ALm3EKNao07x5EsyFrlbSzyw6/l0d3Vmd6HtRRQ
+F9+nA9uqvOSofbhYexl7KB2Ahebmp+d6SxuEU7gUkZScJ7Re9jd1z2cWBuSwRvkT
+WUcCa8i7YfiDvTq7BvVE+rHSkQAC2tUpH5kGHFr25P8J6f6Mr+flO44eNgo+pbJ8
+3KGETRjM/Fug7wAkDWu5JP+pJk7LOHVuuxg0NW/7jny6H6Bzkmc2ypMlAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdHNsaWdvLmllhiVodHRwczovL2lkcC5pdHNs
+aWdvLmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqqAIq1XMY1iF8IG8Nrqws
+BTWwrDANBgkqhkiG9w0BAQUFAAOCAQEAgu0p4z0DPoFXijkpdX0OqB7CVQMqjIqY
+CTlQqZ56bKGKdQP7NpUHD5tiRHh4pB1LNLSh2xqKOgudqFo2lAHGQKf8nMtCi++K
+jy7Q+vVmTnTXvQrYm32l9Rz94LI87vJTUATa8/4sCpUCw2xxT3EfhQpdssprrygj
+QIetzxpSXXz3n8tdU8r0wql2IbivjLdPKS0QOD+RAnTzVVBbKR0lXGBsVfR5oI2Z
+k3pnLaUJBrOCfFJMyrbTiKAOM4VDp8biKKxnYH0hs+hnDDOmKhRH1aqC9JuQ96xk
+AzsGEoivSwmcdqqwrTDW9ILcLk9Z7EsHRPKz1erD1ItJqsdN5EHsFA==
+</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.itsligo.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itsligo.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Sligo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Sligo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itsligo.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kieran</md:GivenName>
+    <md:SurName>Kennedy</md:SurName>
+    <md:EmailAddress>kennedy.kieran@itsligo.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kb.se.xml b/swamid-interfederations-2.0/idp.kb.se.xml
new file mode 100644
index 00000000..88ffe07a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.kb.se.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kb.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga biblioteket</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">National Library of Sweden</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Kungliga biblioteket.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for National Library of Sweden.</mdui:Description>
+        <mdui:Logo height="100" width="86">https://idp.kb.se/idp/images/kb-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kb.se</mdui:DomainHint>
+        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.33822,18.0722617</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">KB</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>National Library of Sweden</Company>
+    <SurName>Mattias Olsson</SurName>
+    <EmailAddress>mattias.olsson@kb.se</EmailAddress>
+    <TelephoneNumber>+46700073534</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>National Library of Sweden</Company>
+    <SurName>Mattias Olsson</SurName>
+    <EmailAddress>swamid@kb.se</EmailAddress>
+    <TelephoneNumber>+46700073534</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>National Library of Sweden</Company>
+    <SurName>swamid@kb.se</SurName>
+    <EmailAddress>swamid@kb.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz.xml b/swamid-interfederations-2.0/idp.lib.cas.cz.xml
new file mode 100644
index 00000000..7adcd2d1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lib.cas.cz.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.lib.cas.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">lib.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Academy of Sciences Library</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Knihovna AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for registered readers the Academy of Sciences Library</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro registrované čtenáře Knihovny AV ČR, v. v. i.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.lib.cas.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.lib.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="160" width="160">https://www2.eduid.cz/idp-loga/kav.jpg</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>
+MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
+YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
+piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
+a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
+y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
+OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
+ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
+LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
+dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
+L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
+CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
+QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
+MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
+		    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.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">lib.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEajCCA1KgAwIBAgIRANDI+WBJrLja3Za/spT310swDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzExMDYwMDAwMDBaFw0xNjExMDUyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmxpYi5j
+YXMuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2UiWcB63g2umI
+piuSQxJCqI1o14aO+Mw8olLBRIzlXILWvNLERmiGpoJLi/St+mtSBIGkfCglX2EB
+a3BSRu8y39Az8ZRjZIuG/VTnuAMKD9wJZceL8TVFnfX1zlj1SgLWvwnAyp2SFSh5
+y27JjbgBp8ClksUClyOUylzJZXybgaYHkDeCyZn7pAlxZyEeVFZwiC4hjoFXJ2gm
+OujJsC0X447F8Kvc6ke5c0UgoFILkXQoms658pgDBu2qHXuUh4A5lW6ODrylKibk
+ZChPVjRWBOSt7gehbgbAWV5zazX3+7uZ3afmAUer7FSQdreuOGIaWy/8U73KEe58
+LtwxyiO7AgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUMY5I3fB9tUmaTSXXXh11pvaZPUswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5saWIuY2FzLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQA+Vri4AZx75skYb+IXgYCSE1STg5WzXh8F8yNlU4I2bNc0
+dB+0yKtsx2NUOi5nQfri4D+2m6t8rH8XfB2EPZw8cgYBwtCG9WiZbWPOoq9rJA0y
+L25v25ABvthARggMuToDzEwGmyiAxYC+eBp/FxgluZ4XHCDYz867+t/LkrlzgIH8
+CyKrEqjEQonEbsjXcmQR3x6RAi15ZsMtSfBaZsNsX8/GnetwKXnZ08MSkKkttzpr
+QKFpdZa8ynMvul92d7lW3wfdKHolmbmRHBzRGLvuVgAGNYTSB4CdiW9rfFtB6mkL
+MZs3uXaOQApwJdtTtWG5OieRs7RQptTPuExaKZdb
+		    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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">Academy of Sciences Library</OrganizationName>
+    <OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Academy of Sciences Library</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.lib.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Duda</SurName>
+    <EmailAddress>duda@lib.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
new file mode 100644
index 00000000..80da0cfe
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lrz.de.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
+        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
+        <mdui:Logo height="108" width="100">https://idp.lrz.de/idp/images/lrzlogo.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
+Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
+A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
+M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
+aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
+wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
+AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
+uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
+gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
+ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
+Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
+ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
+Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
+BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
+ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
+qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
+/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
+zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
+kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
+t0kVopfGsEIT142DrBwPmGvPGmU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
+Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
+A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
+M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
+aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
+wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
+AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
+uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
+gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
+ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
+Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
+ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
+Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
+BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
+ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
+qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
+/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
+zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
+kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
+t0kVopfGsEIT142DrBwPmGvPGmU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
+Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
+A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
+M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
+aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
+wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
+AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
+uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
+gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
+ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
+Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
+ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
+Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
+BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
+ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
+qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
+/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
+zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
+kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
+t0kVopfGsEIT142DrBwPmGvPGmU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
+Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
+A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
+M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
+aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
+wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
+AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
+uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
+gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
+ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
+Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
+ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
+Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
+BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
+ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
+qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
+/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
+zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
+kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
+t0kVopfGsEIT142DrBwPmGvPGmU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e38</OrganizationName>
+    <OrganizationName xml:lang="en">e38</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.lrz-muenchen.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mast.br.xml b/swamid-interfederations-2.0/idp.mast.br.xml
new file mode 100644
index 00000000..e4d9e89d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mast.br.xml
@@ -0,0 +1,116 @@
+<?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.mast.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">mast.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:DisplayName>
+        <mdui:Description xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
+        <mdui:Description xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mast.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.mast.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExNDAyBgNVBAoTK01BU1QgLSBN
+dXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxNDAyBgNVBAsTK01B
+U1QgLSBNdXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxHjAcBgkq
+hkiG9w0BCQEWD3N1cG9ydGVAbWFzdC5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVp
+cm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEUMBIGA1UE
+AxMLaWRwLm1hc3QuYnIwHhcNMTEwODEwMTU0ODMzWhcNMTQwODA5MTU0ODMzWjCB
+4TE0MDIGA1UEChMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBDaWVuY2lh
+cyBBZmluczE0MDIGA1UECxMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBD
+aWVuY2lhcyBBZmluczEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBtYXN0LmJyMRcw
+FQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8x
+CzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAubWFzdC5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALq/Jtq5wZZuruoxS9xHqrKxS184BB7KaKbG4gDe
+rM7i6fjz9FqHiOenzzcPfx8QK3/jx138GeLh+V7xIhKbmkACoOaugVXF9tka5D8C
+T00bWQb3kgVE4o/CENU+0LXTYD1VqI+EPQhtwOtbApMcqgNpl11erTicoro2EUSb
+Nwvk7evnH28I2OR5MyCvc3VKmQYPebSZbZp7JDhTBPb/Eh53SJC0kHrbXvAAhVEy
+J4RNah7aD5LEN0zEsCnuBo82XSxryd5Q9mjYxF8cd5bGKOKMePyle3EMUfSg3E/8
+VijugSLN3Xmary9QNpnJEpK/NvQl8rRKV4H8SQiriR38nIsCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEABbhVYQRVmgVV+ZkapypYtD6xCJy8ARghj1oPU61AbfONICcr
+JBDtNEOWFlH8zTL42/EEEzWFFHjMQffIzEzPiGU4Km8p8bF2PPZC8YA5NCbOMv21
+nyPCnxetzKXU8q/dEoQwJwX7rILsvHglAxjtW6DIW4oWFnVnCjZhQoeVTeRkBywE
+IzG8yFXmV8X9zW3yQfoE3UOOEWkCPwkKE3SgysBrb9Z1C2VbL9pa/t0DcFedbg/3
+M/JFnTWdElxhlTAEUdWG02Q/wBD19fwkL4CUojJik6Jx+GqWojC8vGQ0DqnmWMu7
+ERJxOdpZK0LarTajQiMby3QbU2sYJ0W6f/9uJQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.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">mast.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExNDAyBgNVBAoTK01BU1QgLSBN
+dXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxNDAyBgNVBAsTK01B
+U1QgLSBNdXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxHjAcBgkq
+hkiG9w0BCQEWD3N1cG9ydGVAbWFzdC5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVp
+cm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEUMBIGA1UE
+AxMLaWRwLm1hc3QuYnIwHhcNMTEwODEwMTU0ODMzWhcNMTQwODA5MTU0ODMzWjCB
+4TE0MDIGA1UEChMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBDaWVuY2lh
+cyBBZmluczE0MDIGA1UECxMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBD
+aWVuY2lhcyBBZmluczEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBtYXN0LmJyMRcw
+FQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8x
+CzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAubWFzdC5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALq/Jtq5wZZuruoxS9xHqrKxS184BB7KaKbG4gDe
+rM7i6fjz9FqHiOenzzcPfx8QK3/jx138GeLh+V7xIhKbmkACoOaugVXF9tka5D8C
+T00bWQb3kgVE4o/CENU+0LXTYD1VqI+EPQhtwOtbApMcqgNpl11erTicoro2EUSb
+Nwvk7evnH28I2OR5MyCvc3VKmQYPebSZbZp7JDhTBPb/Eh53SJC0kHrbXvAAhVEy
+J4RNah7aD5LEN0zEsCnuBo82XSxryd5Q9mjYxF8cd5bGKOKMePyle3EMUfSg3E/8
+VijugSLN3Xmary9QNpnJEpK/NvQl8rRKV4H8SQiriR38nIsCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEABbhVYQRVmgVV+ZkapypYtD6xCJy8ARghj1oPU61AbfONICcr
+JBDtNEOWFlH8zTL42/EEEzWFFHjMQffIzEzPiGU4Km8p8bF2PPZC8YA5NCbOMv21
+nyPCnxetzKXU8q/dEoQwJwX7rILsvHglAxjtW6DIW4oWFnVnCjZhQoeVTeRkBywE
+IzG8yFXmV8X9zW3yQfoE3UOOEWkCPwkKE3SgysBrb9Z1C2VbL9pa/t0DcFedbg/3
+M/JFnTWdElxhlTAEUdWG02Q/wBD19fwkL4CUojJik6Jx+GqWojC8vGQ0DqnmWMu7
+ERJxOdpZK0LarTajQiMby3QbU2sYJ0W6f/9uJQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.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">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
+    <OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mast.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.mast.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Leonardo Cardozo</SurName>
+    <EmailAddress>leonardo@mast.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mta.hu.xml b/swamid-interfederations-2.0/idp.mta.hu.xml
new file mode 100644
index 00000000..3d1419d0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mta.hu.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mta.hu/idp/saml2/idp/metadata.php">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">mtatitk</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAM4B1jSKcSpIMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAkhVMQowCAYDVQQIEwEgMREwDwYDVQQHEwhCdWRhcGVzdDEMMAoGA1UEChMDTVRBMRIwEAYDVQQLEwlUaXRrYXJzYWcxEzARBgNVBAMTCmlkcC5tdGEuaHUwHhcNMTQwMjE4MDgxODQ4WhcNMzMwNDE5MDgxODQ4WjBjMQswCQYDVQQGEwJIVTEKMAgGA1UECBMBIDERMA8GA1UEBxMIQnVkYXBlc3QxDDAKBgNVBAoTA01UQTESMBAGA1UECxMJVGl0a2Fyc2FnMRMwEQYDVQQDEwppZHAubXRhLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArXgM7QbY9DMXbKVA2N0pYeN2pOpvCjfchMWdCLwccd4n02NSff/+K2gyvQutMaxsYtCY8JjY2FIeU+IMig2LjuMCMHXIpntGhULa2+T6xcyclt5sp7hp7+NdD/L6dt2GRAEFJto3ostW4PV3eX5D3r0P7NjaC3LrtcDM+iwpp6HqFsUYZXPT0EiH5tJnZDo+EhlfPm3j5fMvQOiSe0hp5hjtoSgn/etcve9WlEH7pqF8AlDk7SkSvTUgbMUtGPmvdNxk6H1ENJRsad2vf7CxxtXfKvKKi1tYEmPQsY4A/9X9FCmprWxJ4bMvGdjST/mEvRwtpKihJ7PiU1qrMU7prwIDAQABo4HIMIHFMB0GA1UdDgQWBBTHn9gU0vszSRWaAnv7wekfRqUqkzCBlQYDVR0jBIGNMIGKgBTHn9gU0vszSRWaAnv7wekfRqUqk6FnpGUwYzELMAkGA1UEBhMCSFUxCjAIBgNVBAgTASAxETAPBgNVBAcTCEJ1ZGFwZXN0MQwwCgYDVQQKEwNNVEExEjAQBgNVBAsTCVRpdGthcnNhZzETMBEGA1UEAxMKaWRwLm10YS5odYIJAM4B1jSKcSpIMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABU1PdlMVAXcFlAbKRjy6Oo1Y4TkmGihKcfUooTdSU45em1ZpichtPtOM4UocQwC95HXgEk28FJqJasVAlRoGoOmtBY9+D8bitVz/xVPcHgt9U7XY8+Q0O07iCdsKFeUCO7iH9kezfIvHPL9jVm0NJMUFZzME3mFcm2+5Qq8ZmYSGTXnkdEamR9EFL2CgC8QnuMxNK3VHbmU2Wc/QjOW0Mp9DdSIBZNXc5i2ANiyHDVl2iIK6U06r4Dr3zafoaLuQrbP15bZgoSda958GYYKnCV58cj5HdXM7ugT18L4KCG+bZkSQtI6ow4aBSxUMGrlf1qJIRNci9Q8FiBbF09hrLc=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.mta.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/idp/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">MTA Titkárság</OrganizationName>
+    <OrganizationName xml:lang="en">MTA Titkárság</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">MTA Akadémiai Adattár (AAT)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">MTA Akadémiai Adattár (AAT)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://aat.mta.hu/aat</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://aat.mta.hu/aat</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>AAT</SurName>
+    <EmailAddress>mailto:szervezes@titkarsag.mta.hu</EmailAddress>
+  </ContactPerson>
+</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
new file mode 100644
index 00000000..6853c2a6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
@@ -0,0 +1,101 @@
+<?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">
+  <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>
+    </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">nesc.gla.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</mdui:DisplayName>
+        <mdui:Logo height="168" width="198">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
+						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
+						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
+						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
+						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
+						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
+						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
+						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
+						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
+						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
+						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
+						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
+						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
+						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
+						XuZK6AuQhAE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nesc.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nesc.gla.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesc.gla.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIVAPq1QpqioWHeh0ScXnahkNLcLb9SMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51azAeFw0xMDAxMjgxMjQ2
+						MzZaFw0zMDAxMjgxMjQ2MzZaMB0xGzAZBgNVBAMTEmlkcC5uZXNjLmdsYS5hYy51
+						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzMo/jm/4YdOcraBypo
+						44Pt5VVSsq362JfQUcuONHVVncUV4WD/60FMjJRIeEzFfFpzbAne6pUnixb9Z1B6
+						fcSpTVN6YhO81LqwnYNumOOlYmYPwDYPObyvpIhcUI4fB/qUbSyURXisbIXlgjow
+						vNbrjxT94otpChHh/MDDf/av1Js96tHUW9qHeE6hCtjKsBOgQRc4F7O4jAwkstlX
+						An0p6uImBE29Dp28XPl2pvGmCX3nXFOxWFNA8/hLaP2WwLwj1We4x9sKrQ36nHXx
+						Vs96YJBQ57UaaXBPciLX0OLi789yuXGBFQVfze1bB+nwg6jyBBYNVRfowcf52tDe
+						ZCUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLm5lc2MuZ2xhLmFjLnVrhilodHRw
+						czovL2lkcC5uZXNjLmdsYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						Bp6Cv9b7k/vjHWMzMz9WVf7A/FUwDQYJKoZIhvcNAQEFBQADggEBAHrb5/goxXFy
+						YTItKSfhHvqYKdLMBYrGDn8c0mXOm3vy1rC4osncx9TjPbjLAJg+i6rZxdfCzgN3
+						Cjlg1FyMEpsRkscPRSQlg9gge2Ecd/iWSoq8Md25feH1Xm7AA91Q3S81mheSXqx/
+						As0WUNFBp9tvIYHCBUMujQzw/O0s3qI8COnjAFpj4K1Hp+0zrjjE860ezhKuGs3c
+						v+9IVxUpfm8spl6EnuWbPGY0+J8N4DqL14G1SuOsMJNMB+qw9JFikzNy0YfHD9YK
+						Gcw5OSlSkClxFLW1fQ3aMDYjRi65tmArCZ4p3utYdqEWy4qzitl/helnRtPojX0b
+						XuZK6AuQhAE=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nesc.gla.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">National e-Science Centre Hub (Glasgow)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.nesc.ac.uk/hub/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>John</GivenName>
+    <SurName>Watt</SurName>
+    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>John</GivenName>
+    <SurName>Watt</SurName>
+    <EmailAddress>mailto:John.Watt@glasgow.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu.xml
new file mode 100644
index 00000000..8d773161
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.niif.hu/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:IPHint>193.6.222.0/24</mdui:IPHint>
+        <mdui:IPHint>193.6.223.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <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:X509Data>
+        <ds:KeyName>idp.niif.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
+    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">NIIF Intézet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NIIF Institute</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>NIIF AAI</SurName>
+    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>NIIF AAI</SurName>
+    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>NIIF AAI</SurName>
+    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net.xml
new file mode 100644
index 00000000..5bb03322
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nordu.net.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nordu.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
+        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
+        <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo height="46" width="203" xml:lang="sv">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo height="46" width="203" xml:lang="en">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>nordu.net</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
+OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
+RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
+Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
+CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
+M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
+ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
+DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
+bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
+nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
+Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
+aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
+JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net: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.nordu.net/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUbYzFMX2BKRKmZwRSWg0HZ3/MQQwwDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNaWRwLm5vcmR1Lm5ldDAeFw0wOTA5MDMxOTI4NDlaFw0y
+OTA5MDMxOTI4NDlaMBgxFjAUBgNVBAMTDWlkcC5ub3JkdS5uZXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSypIpdblxznunPXiwKCqwOYmj99u5S9f7
+RTR+s8EDs01uwJ8buJs0MId+s96mD8MIkobE4iwn/B6xlafbMr3/BF+XxxH8Q5WX
+Bf3aQV3ohBqur6+mRQ2C+EenzPMGHmV/FCz0cbmTsIAQHZ9Vy16H+x5uWOBVd44i
+CMLM+fgjKyYcpcEUJP9Jkn/+d36L3mdXbyqAQS2UPN+S1g37xrgR2kWW+s1lMEiR
+M/f5L+PuA3l5DxIBmK0tFo+ZPLxbr6OBWOdH6EUbfdkvfciFCVNbWBGRW5MC2aru
+ATCdtf/Vev3OngUYBGSR/94eTgMcs3Oww/ppxRS6dzntGnnCT1sPAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDWlkcC5ub3JkdS5uZXSGJGh0dHBzOi8vaWRwLm5vcmR1Lm5l
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUwPXuksUpm5OdopeWHdoRcs6wCu0w
+DQYJKoZIhvcNAQEFBQADggEBAHiPOKmhiLnx8ecuQHmwmh4DUZvarhZXNtgxyasU
+bZAfPoZn8YiELiqYQoA/j+hoAfWcCEafMgjm8nkQO9aad1cwpGY66SIRKPAKBgsW
+nOugnrREWwYl1tXG3VWYzpgygycziYzkmwc4ysHQATKjCYdulA1tZ09YiAnZOIzY
+Q93/gA7X177nVKnAbmSkY1Nap4/rbkHIvQqk8RPSYs5AwasThkEFVk4OQpPtoTOn
+aOBLkJxpXY7rZDixrz59ny629qmOOakSCsuVkNwDPmbLQy9dKmHXTcge2xP0mDK7
+JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">NORDUnet</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>NORDUnet</Company>
+    <SurName>noc@nordu.net</SurName>
+    <EmailAddress>noc@nordu.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>NORDUnet</Company>
+    <EmailAddress>noc@nordu.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>NORDUnet</Company>
+    <SurName>NUNOC</SurName>
+    <EmailAddress>noc@nordu.net</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie.xml b/swamid-interfederations-2.0/idp.nuigalway.ie.xml
new file mode 100644
index 00000000..75b54ce5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.nuigalway.ie.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">nuigalway.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRwLm51aWdhbHdheS5pZTAeFw0xMDA4MzAxNDUyMjJa
+Fw0zMDA4MzAxNDUyMjJaMBsxGTAXBgNVBAMTEGlkcC5udWlnYWx3YXkuaWUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVTQr39i7dOPz//U7kaSk61ADv
+8zczZ4deMcSfUXGtBXwm1G913PqpjDkphmI5A5ehg7tOLjc1I/QXQI/MOi5EW5p8
+9mlrjtjuikIEZ1QJFnM0sGP2wNXUmFnfD3SX78lZbd6pqTDh/EyyO21q/6/7nIH3
+8Ds/R51LWZ4SHLXiVUj+xoLh9PaIWb1j2X9AS6t7FoUTfkQDTrNc78HNpTRy/RPN
+RKfzVUWsqmCbgCrVgz2k8ie5j9YDJ0IpFfGbdBOGUqaZuu53gyMzRTJ2KCmKIirH
+hMtk4fkx3lh9qaWMvpep9Ys9fcvv7h9ODKBDycRxoVJhfvKpRct3OmU38DFnAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5udWlnYWx3YXkuaWWGJ2h0dHBzOi8vaWRw
+Lm51aWdhbHdheS5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUoSgXUY0R/R/L
+Weanf9/oteOvIL4wDQYJKoZIhvcNAQEFBQADggEBACenzaISa4sjW40cKZAdYMYp
+Aj/83wlM5r5jNvK4XML3DuQdgvVfgDhU7DLbeQTPvcySE2Mfn87PHT7wdCXZoOu0
+COH3D94Tc3/G3bu1uLg/VV6TGsNDHL7WqoUNnmHniZVOi6khONlufFLj4TbR3a8u
+xS/b1aO8RapnJUXY0Vhem17h/8bHmpw1RurScX0lXL1JA0PPEaF9nTCW5KfIOBVE
+YnwBW7s4pF85szVB4cSNiz6pRVenAw6s6bJ5AVYSXYGmkDRpm5OCzdVNzOzjlmrF
+kun2ue2G3ICbbxLefYZY3Y2Z8ASfN3caaadnEwn9ya6o47MywXTzmzIIbq1mvWc=
+</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.nuigalway.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuigalway.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">National University of Ireland, Galway</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">National University of Ireland, Galway</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://nuigalway.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Diarmuid Murray</md:SurName>
+    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Diarmuid Murray</md:SurName>
+    <md:EmailAddress>diarmuid.murray@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>ISS Service Desk</md:SurName>
+    <md:EmailAddress>servicedesk@nuigalway.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu.xml b/swamid-interfederations-2.0/idp.ppke.hu.xml
new file mode 100644
index 00000000..5084dec7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ppke.hu.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ppke.hu/idp/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">ppke</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sotelib-vs-ppke</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ppke.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">login.ppke.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:IPHint>193.225.109.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIVALqsFrR4I9Bs0KO2BfLx5BkiO3BEMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNVBAMTC2lkcC5wcGtlLmh1MB4XDTA5MDkyNDA4NTEyMloXDTI5MDkyNDA4NTEyMlowFjEUMBIGA1UEAxMLaWRwLnBwa2UuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2OUIJ85ChB9LqQ+KHBXLtCODAr4phVIYGiTp3qDMHOOtGBNUKoyq9AMyVb8nk+coIA0+v5yHOdWHB2ZLz7T7BE2XqWYP/LjW4o6ImBcPnZO3CMYH+EWaxgqvpoS12DlEd9dCJqGqNmL7NYFM/+gX4FeHOCIIKN86ol8Kqup/OVvF9KpzNVaPiVB5UitWO7FG3ZStIGa7kXM3VZW6DpN1Hfs4eQxNPzl0L9em1SMh1KybUde8w0eDaTJHWDvC8W+jwz+3Qc0HHX2BO0SX7LjrJ0/sjU6fEWEP/Q6tApcb4pKxtcWPBC5cdRawyXx5eixirnHafNmWXZf3vqCbd4u67AgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lkcC5wcGtlLmh1hiJodHRwczovL2lkcC5wcGtlLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQVA2Fh1jDMY7aRgf+BHStRAVdNkjANBgkqhkiG9w0BAQUFAAOCAQEAQkTajo9mUk/O/yyDv19cb3e9du0FH8TSY5YYYUEsW8xQf5tj7JKavI82FK0ixQnBW9E9I2GEtefMzk11g7DGHujhEyPR8OYoCpCH5UpsxHR06+ZH5kf7bVRxj3FahhgFYCjKQJ8gkmuem8wVd8BkEvnFjt4aP61+Afe+mcNjTm3IYN5iBZPMn/4xpHqDvH7tong+nXD58mMBtDv+JlwVfn7uq9C+OoPMaHWKgt+Y3Rp15/pdTmVzZFjzHxc2OKGM6TRP1woQ6CEx3M3qiCXtP57nApLg0XNLtrMM3jUpEECXyrM4vr6mdBVJqDJAHkr0Ej85ZP84waSs/Ojj5U5etQ==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.ppke.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">Pázmány Péter Katolikus Egyetem</OrganizationName>
+    <OrganizationName xml:lang="en">Pazmany Peter Catholic University</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">https://info.ppke.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://info.ppke.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Csillag Tamás</SurName>
+    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Csillag Tamás</SurName>
+    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Csillag Tamás</SurName>
+    <EmailAddress>mailto:cstamas@digitus.itk.ppke.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
new file mode 100644
index 00000000..78f674e3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
@@ -0,0 +1,106 @@
+<?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.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
+NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
+aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
+wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
+6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
+CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
+pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
+VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
+GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
+YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
+9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
+CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
+2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
+BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
+zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
+k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.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>
+      
+MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
+BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
+NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
+aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
+wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
+6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
+CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
+pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
+VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
+GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
+YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
+9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
+CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
+2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
+BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
+zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
+k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.puc-campinas.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">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
+    <OrganizationName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">PUCC - PONTIFICIA UNIVERSIDADE CATOLICA DE CAMPINAS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Carlos Cesar Braga</SurName>
+    <EmailAddress>cesar@puc-campinas.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr.xml
new file mode 100644
index 00000000..1a459b2d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.renater.fr.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renater.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-10-15T16:51:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GIP RENATER</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for RENATER employees</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Fournisseur d'identités des employés du GIP RENATER</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJDCCAgygAwIBAgIVAOKBqJWqJFq6T2dHTEfrhVJRssecMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5yZW5hdGVyLmZyMB4XDTEzMDMwMTEwMjUwNVoX
+DTMzMDMwMTEwMjUwNVowGTEXMBUGA1UEAxMOaWRwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo6i0pn7lTyN4PkneU7/zJAG4k0P/W
+vBzSmAnTQuNtq9z4GsZztrXofycWCF/ekQcWPOK17NNx1zcE28Fhun3/lNWjE+X+
+tDqoB14T5M2lOGdlk5JIuE6N240cuaZGQmvIvCgvup9ESEEDjdyx6V7KR1s5rz3n
+diaTygk2FU51vknOqoMvHWOZjp2tbYo7KVHrauxKxbXbVewmKcN8LKeRL+qZs5wQ
+5Yrd1/juM99r37kF+1QVVGa3/OQicHal1qJG+UNlH3FuUHu3TCmLxWP4WW1WtKCi
+BP+RIm/WHaWD7bPPDH/XTYLFfJqJ0ZbXLA92jlo1dZ7qhiehl7ubk2KRAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5yZW5hdGVyLmZyhiVodHRwczovL2lkcC5yZW5h
+dGVyLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYy83Ve884R0jR3BqE159U
+zbFhDzANBgkqhkiG9w0BAQUFAAOCAQEAOxYs5vfum4LbmsePdGng6mKi8PFcpGKh
+dcFvxOxggLD1YX+R4C1MooN69a3Nf+YY1GzYZO8rUKd+3YL/BhJb0ouE31CzxwLP
+uXCctT3re8BW6GKy3JGju9H3sJ8AJUog3rHCegIJrA7PYarIAQUokEgCzaE5M/sT
+xY7nHrrdSo+QUQSyIYb/Ue7003/wr+8yRc42lx/hbHAcj9vIkrVvFpPCAg86rS0N
+Ber/c4EoBOTHkNkGxaFSWKA8trRJUecsobHum/jjuwwJBahR8Jvf+p0a0ADCrsqN
+JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">RENATER</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>support-federation@support.renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl.xml b/swamid-interfederations-2.0/idp.reuna.cl.xml
new file mode 100644
index 00000000..5791c843
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.reuna.cl.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reuna.cl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2012-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">reuna.cl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">REUNA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">REUNA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">REUNA</mdui:Description>
+        <mdui:Description xml:lang="es">REUNA</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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
+urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reuna.cl/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reuna.cl/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reuna.cl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reuna.cl/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">reuna.cl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAMgGajMxYcuCX0BjnEL1yGAy4iHvMA0GCSqGSIb3DQEB BQUAMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDAeFw0xMTExMjkxNjA3MjJaFw0z MTExMjkxNjA3MjJaMBcxFTATBgNVBAMTDGlkcC5yZXVuYS5jbDCCASIwDQYJKoZI hvcNAQEBBQADggEPADCCAQoCggEBAI1sVrn6YL3ric9ZdLHAMumsbxnB/nMk/8Qm pyV+0io8aygQ/tFz3spUbuRbo8y5spj60kyod1037mQc/MbHsEkSlWN7Mssx/+uE 6wPaJFHZ0SGx+wlJC41k7jty7r2/72l3NhZJo5L6sDQuUz30PKYbcpANIPxo+LE6 lgbGYoJTkKpOfnFCoI+GLXKLrJU5Dyu084iq+Xu4Z9qssEkck/FccimMoGvFBt4T LTNSz2AuLcK+H4/thu+TrNkKqH881zZHqqcjTApFNMWd+XMaQ/rUnToKRMqtREBU bUCFQIthnEvvuTZXXbx7LwTMQ7m6xjyU5BUAGGywFHlq1HI76QECAwEAAaNfMF0w PAYDVR0RBDUwM4IMaWRwLnJldW5hLmNshiNodHRwczovL2lkcC5yZXVuYS5jbC9p ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUsmYmPyA4OX063eSXo0a8l2n13oUwDQYJ KoZIhvcNAQEFBQADggEBAHABa/rRLuijB1iSCWCcKx2hxAjUQswnZWCkEoxKExbB kxcDEKIB9EjIGMtyZasmiZwfqxZB83+EuaUqqow8Ztc4+2HSo61zwXkAT6qq3UMR f6O1UG9P2hb+4JejmjbH+Cl0AnaZGEapFQD3tnNlYtiv4JMmCHjrB5lt1aOkXTgX fEfClN1s9KYi6m7dTrEDmEyz3ua2QlwB/mOzTxQiWWX3ERwgsj8QDQ078U/X619h i2RT2URIEGnc0EleBMFqvGFjoZzobqlNjgataFzLccu0RKf6MRFfLjjgx/9iGvZa BlWcNruQPt+UBJhIBmEmwcJotRH49VLn8PyDPGBea1M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reuna.cl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reuna.cl: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">REUNA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">REUNA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.reuna.cl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>REUNA NOC</md:GivenName>
+    <md:EmailAddress>operaciones@reuna.cl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Alejandro</md:GivenName>
+    <md:SurName>Lara</md:SurName>
+    <md:EmailAddress>cofre@reuna.cl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rnp.br.xml b/swamid-interfederations-2.0/idp.rnp.br.xml
new file mode 100644
index 00000000..35561afa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rnp.br.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.rnp.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">rnp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.rnp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.rnp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
+NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
+wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
+zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
+eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
+LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
+lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
+ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
+EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
+r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
+l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
+kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
+IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
+ktvi8RxRxbw=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.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">rnp.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC1DCCAbwCAQAwDQYJKoZIhvcNAQEFBQAwMDEMMAoGA1UECxMDR1RJMQswCQYD
+VQQGEwJCUjETMBEGA1UEAxMKaWRwLnJucC5icjAeFw0xMzEyMDYxODQzMzVaFw0x
+NjEyMDUxODQzMzVaMDAxDDAKBgNVBAsTA0dUSTELMAkGA1UEBhMCQlIxEzARBgNV
+BAMTCmlkcC5ybnAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCp
+wcuNgUWHb0fw6PeIrPUaOtMTIEQ5qeOJPvOYAAzwmcu8pwb6sdvLJC/NtKK8NGkv
+zT4JL/ZHoNNK1bYtYT4temrGaUmJ4QsP7eZjISLljX/NwSQH4D4Gf8iKG+yGpbpM
+eSAMGMQjlZYQasJorFijzc92N5nyW/yVNrbviASeRBgQJubEvbOg3pp2wiib3kLG
+LyZCMPCGRGBZoa7+Da55D846zyr2Ck4srIA/oTgRSujQn5of7ocSFchewrYUtMPk
+lUtW9XJgwE5RcfVXSmZiAK20miqiBlvBHqnrh1EGNduwKirg5hCI172kv7pfyUrx
+ayzJpuluiwd+HEVm1SDLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC73q9t8XD44
+EFN4Zvw/K6ffWlEShuT1Q6cQArv0sn7Z0m10bgjW2EyO3nM/iF/X7RhToyeov3Q4
+r+3en+9JMRnwFuA1ReqQR/2jjInkfvOV1a6YOn2hsqLXpskjCg+wQEyOhyOg/bUN
+l/J1fBDwIDL9ym+4vG7ujnE5vE8vbQqWIjlQV+xXvk/vQBmmmxEG6bHFwxHW5AP3
+kkjlVbW5hU4Mwj9Ac1259yulrX3viPzOkW5+Kf823GNI16LbOLNIjw98gZ6didxX
+IkwnKZWu8klBLzPjr8I4K8C4kr3SktVY1ddGNTfEUBAx54uU1T55fWFR4ZW0WO4E
+ktvi8RxRxbw=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.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">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.rnp.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.rnp.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>GTI/RNP</SurName>
+    <EmailAddress>servnac@rnp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net.xml
new file mode 100644
index 00000000..bec0386e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shibboleth.net.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.net/idp/shibboleth">
+  <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"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:22:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shibboleth.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net</mdui:DisplayName>
+        <mdui:Description xml:lang="en">An identity provider hosted and used by the
+					developers of Shibboleth.</mdui:Description>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIVAKyBWnv1/h1U11C7kHvV33FIrEsJMA0GCSqGSIb3DQEB
+						BQUAMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5ldDAeFw0xMDEyMjkwMDA5
+						MTlaFw0zMDEyMjkwMDA5MTlaMB0xGzAZBgNVBAMTEmlkcC5zaGliYm9sZXRoLm5l
+						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjWAdpUx/82FUzrRMfA
+						M63PkZZYCm3RnT3eiL+DeJcbGdcEJx/o+32vgHXJgJOBt14YdVam5GErIYgk4SGq
+						5Z5RYl0PpQn6HQG/9prGnYCu6p5zfb0557o51Eh8TcVehS6Y2ruyCjAF0jgVMwh5
+						/0Oh8EE9wG93pSpm70DAiiaTVCb8WoT1aZYtxbBmmuH10bU+wge/NMmaHuVAe599
+						pyezFIL4FoI2g+1Q6nG4Yl1Z07I81tTApXKVMWRt/4/M3m2D7PUMOQ9qsxthp2L/
+						LovIeNo0bTyeW290T2Y/JRZhKOgeDqkhuu82DPri2Vm5G/unB69KfRB7CF9QWIc3
+						y80CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNoaWJib2xldGgubmV0hilodHRw
+						czovL2lkcC5zaGliYm9sZXRoLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						3uZ32tKXJBzPCTp2dtHSLV0FvGgwDQYJKoZIhvcNAQEFBQADggEBAAYXYuzp0UTj
+						3yLRvUCbEtaw9b80+weOELkVv3WFY3QAG8pIKEblrMMtzrzLFWZwYwwMZDab/HnH
+						egmgjZBthrOedEmoJ+OHRmIiS8zdZxVGEadJhTUaeIkO6kwK7Ht3nQePoiXV7TI5
+						+A9SpmZGoukC85Za4wGDw4xWGs5t5l6tBuuV+1s0oC6T8ih5n/NyThfpbihSW0d7
+						iBfSUickgpoM2BLM3FCnbO8HOsX1rGV4ypG9ZGDDvr2jrzalXXmc05gSlL2qd9ce
+						Q1M+9vavusPCqlj2zZf2/HfzhyiFcb/OgA0oTFWW2ynXji6UarIV5QaPoi/XmGmx
+						BXD36HfGBXk=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.net/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.net/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Shibboleth.net</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Shibboleth.Net Technical Support</GivenName>
+    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott</GivenName>
+    <SurName>Cantor</SurName>
+    <EmailAddress>mailto:cantor.2@osu.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ian</GivenName>
+    <SurName>Young</SurName>
+    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sissa.it.xml b/swamid-interfederations-2.0/idp.sissa.it.xml
new file mode 100644
index 00000000..0e46da2b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sissa.it.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-09-09T11:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak 3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8 BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
+                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+            </md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak 3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8 BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>
+                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+            </md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Massimiliano</md:GivenName>
+    <md:SurName>Ritossa</md:SurName>
+    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
new file mode 100644
index 00000000..654aa93d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ssc.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.ssc.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">ssc.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Centre of Administration and Operations of AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Středisko společných činností AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider SSC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SSČ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ssc.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="74">https://jiftach.cas.cz/loga/logo-ssc-44.png</mdui:Logo>
+        <mdui:Logo height="638" width="1080">https://jiftach.cas.cz/loga/logo-ssc-638.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
+qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.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.ssc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ssc.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.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">ssc.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAM17FMyMTScGvy0JdedneKzQSTuJMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5zc2MuY2FzLmN6MB4XDTE0MDEyMTEzNDgxN1oX
+DTM0MDEyMTEzNDgxN1owGTEXMBUGA1UEAxMOaWRwLnNzYy5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO9p492zRmGFmhH7Qq7l1Vy3OBRyZc
+tIyaocn/FLBJ9TkGUqYdR29wHCmKnGOwXFF6VIBdfsmVmuFczjQcpAqPQ4zcS+kl
++Y6yDMINQv0eAZvRvIDK4jfF5GVZAXwbUuPLr8Cl0L0ZbzNPT7ewi7sHO+8upqv7
+7bhwyG8ZMYgMSPeM4jWuThv+6x5DRlnMqjq+qBev95MRK0bZRSJ3XKyDa+Nso8Df
+R7rYnFHF+Al4AujMgQzN+hDRjxyD2Wp1xYK9BguctIFyHiS0aXr0CB3PcCnRfdRk
+GTH2SX3pNIJ1olEODLyHfNF9uJt120bfaFgaGau/iRCXwuj7Ap5PLiURAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5zc2MuY2FzLmN6hiVodHRwczovL2lkcC5zc2Mu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWD+N0hIllSytm0SBw/34M
+IGBstDANBgkqhkiG9w0BAQUFAAOCAQEAXqvCIxGFBSBtfecHgvx3j5kYiG0rutzh
+XhdFJZrPWARnMdL0VLfK064Y+OWsv1sbovS31HWxvCWqfBTmIu2e658IGnCYUBGX
+/e8/NG7u9SeS6ie7U6B1kFQIYrgSKHH4jookel03sIF0n36C3XMG95h7TNgZQ5Vf
+JQwAd/6FCX9a+NzhTJZWMXPCIEjGICjwbddAPsX6aSAUgIyif0EkIDSvcckkeLT0
+Jy+EMpZzHBrcYckNCLqr8PsQxGAM6g7mUC8ebGVX9bjkOGplkUUzlsNQE4djcNvY
+qOgmzrGDcWxrRDaRKM2/jYdmcKg6FmAZE1Vpdy+W7j2tbvLDXjLpOg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.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>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Centre of Administration and Operations of ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Středisko společných činností AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Centre of Administration and Operations of ASCR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Středisko společných činností AV ČR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ssc.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.ssc.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.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se.xml
new file mode 100644
index 00000000..51f14e45
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.student.bth.se.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.student.bth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
+nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
+4NzN1iC8kg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.student.bth.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.student.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bth.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUXtEpwm2skeWeBBMWVN7MATD1VK8wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNlMB4XDTEwMDgyNTIwMDU0
+OFoXDTMwMDgyNTIwMDU0OFowHTEbMBkGA1UEAxMSaWRwLnN0dWRlbnQuYnRoLnNl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsO+nW3r0Rzu0ojoCY0Jm
+R/GuN73dy9gDYOtvgwtFJkVdQBuEGDvVYgD4WUzCnSSy5b4EGFwAaBLIfZ4UAL2c
+fWIWJknPrfSxFqR9dLJJo9hkHMX8VBumjhzYHVZqYSm/JVGh4GYewhQmRO0iSG9a
+it5fe6ZyVG67TduhnwzFC8azRSfIgnEjaRGP2qVEiUIbfuiRRr2J88rwxyxrYCa5
+ZVMLjR9wSBRqG8P+00UDolT3Q0lvawF3pj+kEbZ2p+Y6UxZHghHi5EKMkvy1OfKy
+RYkfxXbGk2JEXGcgb3MyRLmdZoqrH0BedH2udrwzOEGUdb/cElqmpFMOyZBdwEVO
+/QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3R1ZGVudC5idGguc2WGKWh0dHBz
+Oi8vaWRwLnN0dWRlbnQuYnRoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRA
+vpCow9+jy11YKdmATEMN1KY1dTANBgkqhkiG9w0BAQUFAAOCAQEALbZz8voHJMiE
+Tjc7RYskFIOAx7k1fmPsF4kSdPyDK8RkyHBfGHa5uJ9wBh4w5BPCp9Wy7SY5+q/y
+E9tDiISVD0NEU8KQX8u8pC1d4OdfT2x6tn+w3Ww5cNaQ3CUsD+VqefiX6Acr3ssX
+0ahszKKVCL8v7ifCqxr1q2dbABB6GV9iwKHB+vfXLIp2Upt6+y3i5+iC1C8uXul0
+TAimxX3igYDGippzeyBoy+es/c7shtdBfj3y3zhfcz/KKJvXFPVF0lwYsW8n2BM3
+nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
+4NzN1iC8kg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">STUDENTS-BTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola (Studenter)</OrganizationDisplayName>
+    <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="technical">
+    <GivenName>Tom</GivenName>
+    <SurName>Martinsson</SurName>
+    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.surfnet.nl.xml b/swamid-interfederations-2.0/idp.surfnet.nl.xml
new file mode 100644
index 00000000..2a1e9fe5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.surfnet.nl.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.surfnet.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfnet.nl</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">SURFnet bv</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFnet bv</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFnet bv</mdui:Description>
+        <mdui:Description xml:lang="en">SURFnet bv</mdui:Description>
+        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">SURFnet bv SURF konijn powered by</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+3P2Tx32Cq1WXCYkxLaPI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ba573f07093978e3852ddef0d2465b84"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SURFnet bv</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet bv</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.szie.hu.xml b/swamid-interfederations-2.0/idp.szie.hu.xml
new file mode 100644
index 00000000..92dca71d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.szie.hu.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.szie.hu/idp/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">szie</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="78" width="111">https://idp.szie.hu/idp/szie-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFzCCAf+gAwIBAgIUSscIknb+7vqGVUw6Kl9kxz2bcWAwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLnN6aWUuaHUwHhcNMTAxMTA4MTExOTEzWhcNMzAxMTA4MTExOTEzWjAWMRQwEgYDVQQDEwtpZHAuc3ppZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ3NmFZGZxB5neVKIfq5+RTZO1apk0MNGinQYVD8T9PXXm4g4d8ZkNAdY/eUW8z3IdkStf0I/7imKjnnC4Px5ImUJ4tOblJ1n1DDYmqYf7ivNuM89gpt8yE+ffGa/EZeGizeVLJLDT0X3+k22otLEZt3s/gDgCRBal80VtiE0IPT9y2L9XOyzzawRAWlfnjCxBrQiJb35OlUnctOHGc4004Jp+3O9xCr9lOqO/UaQPKpTUFQvK9NIBaV8VqCA62+SQsiSjWtg8Rc/AcdBjrmVcMrU8mia26VyRwtZ0vZpIlpiUhKnuwmWuFMJvAymXI74OwrmYkudzqGgvbk+N10snMCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLnN6aWUuaHWGImh0dHBzOi8vaWRwLnN6aWUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ/ZbxqsxhPifPOOGn+OHtet0wYvMA0GCSqGSIb3DQEBBQUAA4IBAQBHjf0B9D8VtyZu2zstLmGw9Mw+f/dRxOBhzXLJVMxHa3XDykxX1MeG70nKFlSz/UsFy/2jH1zU8E/2WLQDGPu6kZtjuxD1xihyJ5bPTHWfn5IlNHjydMoOt4CnC1xTYB9ObhKqATdVFJMXdRegCpasOV4gLfdFGIneU9YhSB9WFCISjvE76iUJbwsitPtRcDfIqsTFnrwDWbeZhEtlmHp0W71JSkrmCOP9tbiyfH7ujW/DLHuHRa1rxiZYGDKvI3sfwjqRnHkBOTWvs/h7xIQxDUJWwkX0JyVSIp4YuhfSTxVq+cWmtLHfaisY7nSEECcM4m6U2T5YmnogM2Rw8Vqc</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.szie.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.szie.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.szie.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">Szent István Egyetem</OrganizationName>
+    <OrganizationName xml:lang="en">Szent István University</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">Szent István Egyetem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Szent István University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.szie.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.szie.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Cseh Vendel</SurName>
+    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Cseh Vendel</SurName>
+    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Cseh Vendel</SurName>
+    <EmailAddress>mailto:cseh.vendel@ih.szie.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
new file mode 100644
index 00000000..847db204
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ufgd.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">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufgd.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufgd.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
+MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
+MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
+NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
+IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
+LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
+NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
+5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
+68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
+MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
+HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
+YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
+68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
+gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
+AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
+zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.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>
+      
+MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
+MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
+MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
+VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
+NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
+IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
+LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
+IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
+NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
+5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
+68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
+MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
+HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
+YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
+68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
+gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
+AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
+zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.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">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Service Desk</SurName>
+    <EmailAddress>sd@ufgd.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufmg.br.xml b/swamid-interfederations-2.0/idp.ufmg.br.xml
new file mode 100644
index 00000000..a0d91e33
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufmg.br.xml
@@ -0,0 +1,108 @@
+<?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.ufmg.br/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">ufmg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufmg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufmg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
+UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
+ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
+b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
+BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
+SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
+AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
+7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
+6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
+YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
+eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
+ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
+/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
+W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
+mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
+XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
+PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
+1K9RfzyW1h7typu5xg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.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">ufmg.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDaTCCAlECCQCkRIPOgAyxBDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJC
+UjEVMBMGA1UECBMMTWluYXMgR2VyYWlzMRcwFQYDVQQHEw5CZWxvIEhvcml6b250
+ZTENMAsGA1UEChMEVUZNRzEMMAoGA1UECxMDTENDMRowGAYDVQQDExFDQSBkbyBw
+b3J0YWwgVUZNRzAeFw0xMTEwMTcxMTM1MDRaFw0yMTEwMTQxMTM1MDRaMHcxCzAJ
+BgNVBAYTAkJSMRUwEwYDVQQIDAxNaW5hcyBHZXJhaXMxFzAVBgNVBAcMDkJlbG8g
+SG9yaXpvbnRlMQ0wCwYDVQQKDARVRk1HMQ4wDAYDVQQLDAVDRUNPTTEZMBcGA1UE
+AwwQc2lzdGVtYXMudWZtZy5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAPIWVxfD/hP4xeS+V2PEAWxlBm7+oM5KnUWojPucNO+FDcpc1ZBI1BSvhxuO
+7KnacD3j31Lf1MUq5rb8jS5ojj927W+1dYiVsI4WsV3e/SHKPJwhzA3/8D+9b1//
+6sgYFeaki33+zyoiMXluWYOuHEhdnnZMITBS0BICiM0+Wx4y42ddt8SlojTFZ9/G
+YJCZr3N3FoTISKnDw9htCpiaWRsm/tElikW5PLjQRwuNfk5TUaxysoOMTKU1OHzG
+eWFWT1eC4cM+5PdZJLC9SMwhSBz34o0aJXz6Rl0EmkSLpEUlkjWd8qGgAbA6I+Rj
+ab1lgvK6Gn+DvZSvoYuENypjClcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAoUhF
+/mtHoskFkWtN7feCf0qaAJi582w1DHUqohbnYRs9ru6XO35saVAW/sn1pzkM4CT8
+W4CCQGknUv4iM5XCdqFzQrmvc6NBekEsdXkJPyV3/L3s+vgpnEJMG44EKP6VkpRM
+mXv14qPfzV+qd5evzDM8oLi6m+Xhi433omqj7FYw49DfCyEWpOsAwE5SdjUaJ+rY
+XhsRQJXlHnagEo7RwekebDBnFS9po0Yz2XgnsZ3QwRnMcAtIVQ1TxA9gUj4IY0MT
+PxmP9DNybuY6lVPrnB0DFL2NQ/S2zmZuivf8kHEpjIa/VuXJFBYC60AIV0wSkSbd
+1K9RfzyW1h7typu5xg==
+                 
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/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">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufmg.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Renato Veneroso</SurName>
+    <EmailAddress>rveneroso@lcc.ufmg.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufpr.br.xml b/swamid-interfederations-2.0/idp.ufpr.br.xml
new file mode 100644
index 00000000..7f392164
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ufpr.br.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFPR - Universidade Federal do Parana</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFPR - Universidade Federal do Parana</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufpr.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufpr.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.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">ufpr.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxLzAtBgNVBAoUJlVGUFIgLSBV
+bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQYXJhbsOhMSswKQYDVQQLFCJDZW50cm8g
+ZGUgQ29tcHV0YcOnw6NvIEVsZXRyw7RuaWNhMRowGAYJKoZIhvcNAQkBFgtjY2VA
+dWZwci5icjERMA8GA1UEBxMIQ3VyaXRpYmExEDAOBgNVBAgUB1BhcmFuw6ExCzAJ
+BgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAudWZwci5icjAeFw0xMjA4MjAyMDIzMzZa
+Fw0xNTA4MjAyMDIzMzZaMIHCMS8wLQYDVQQKFCZVRlBSIC0gVW5pdmVyc2lkYWRl
+IEZlZGVyYWwgZG8gUGFyYW7DoTErMCkGA1UECxQiQ2VudHJvIGRlIENvbXB1dGHD
+p8OjbyBFbGV0csO0bmljYTEaMBgGCSqGSIb3DQEJARYLY2NlQHVmcHIuYnIxETAP
+BgNVBAcTCEN1cml0aWJhMRAwDgYDVQQIFAdQYXJhbsOhMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLaWRwLnVmcHIuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDhSIFAyy4DlsvFhaSd1r3CiUjp//kkxFlfeZmtj5gLGupTk+fQF18j71Go
+K4OwvL82UI/KYE5Me2tlueEJvBExd79by4fBME6SADdHc9Su1w1lctn4s6Mko9ux
+j9WcbrBfncbdj80T6W88EDH+V74oiCEElxBLfBOeXJCuMjc9uSaasbIMWMK+7ExV
+lz7d8ll7umv5AX84tpq8WDkc+7fcP9+p5GMtcTrdPKvL2CvSFmrnz+efKb6cNOT0
+B058D+uHPb0PasA6+xHpO3V3pSbSdcf8IqlvJKvoK8dch4qQ6uZD+Rz8ruxaPpBH
+cJdZk6hk0gc+7axjEWo/89CJauJzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ70
+kkZit+4D85Xi5Ms8+EYCjCo0GfUUp83ASZyPRml/D0VnOHLuj+dbPdQM0znnb5Sg
+7hIbSs/ERqrzKFJMJikpFXm1RQZNNRdf0d0V4nTrliXjGQcPCqXexdXRE6oBMeAi
+apbG2X8rFstwVVghWlbqkUjtko8MgUiD/RyjbAqVBWxqNjRGB3JOVt1g2SJ1tW7x
+pL1kcSedKTjYji+gJ9NLqumL9LTdtlqPzdBlChK4SfIIK/BE3GtD1S6rHn2wX+MC
++anyEs7LQkZJPiqDeo2VM3XLIHdw5VTf8HnFiLJMiDkuIUOj5g77gFFE5HGKPuur
+k+Eyx9965LHHOvpH3Zo=
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.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">UFPR - Universidade Federal do Parana</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufpr.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Antonio Rodrigues Barros</SurName>
+    <EmailAddress>antonio@ufpr.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ujep.cz.xml b/swamid-interfederations-2.0/idp.ujep.cz.xml
new file mode 100644
index 00000000..7ed2c38e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ujep.cz.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for UJEP in Usti nad Labem</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro UJEP v Ústí nad Labem</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.ujep.cz</mdui:InformationURL>
+        <mdui:Logo height="40" width="102">https://trilian.ujep.cz/logo_ujep40.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>
+MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
+LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
+U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
+kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
+ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
+cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
+Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
+3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
+IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
+yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
+psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
+GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
+DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
+C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
+oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
+ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
+moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
+Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
+Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
+b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
+VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
+oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
+bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
+MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
+2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
++q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
+idTONNLnAFV37h16DlOV
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
+Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
+YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
+eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
+eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
+bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
+MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
+DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
+ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
+IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
+ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
+KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
+f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
+xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
+LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
+chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
+YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
+ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
+5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
+6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
+U19RU7sLdrZ60inUFxdxr+AR
+             </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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.ujep.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujep.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
+LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
+U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
+kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
+ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
+cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
+Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
+3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
+IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
+yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
+psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
+GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
+DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
+C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
+oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
+ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
+moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
+Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
+Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
+b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
+VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
+oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
+bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
+MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
+2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
++q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
+idTONNLnAFV37h16DlOV
+                     </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
+Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
+YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
+eSBpbiBVc3RpIG5hZCBMYWJlbTEcMBoGA1UECxMTQ2VudHJ1bSBJbmZvcm1hdGlr
+eTEUMBIGA1UEAxMLaWRwLnVqZXAuY3oxJDAiBgkqhkiG9w0BCQEWFXBhdmVsLnBv
+bGFjZWtAdWplcC5jejAeFw0xMzAyMTEwODEzNTJaFw0yMzAyMDkwODEzNTJaMIHY
+MQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxFzAVBgNVBAcT
+DlVzdGkgbmFkIExhYmVtMT0wOwYDVQQKEzRKYW4gRXZhbmdlbGlzdGEgUHVya3lu
+ZSBVbml2ZXJzaXR5IGluIFVzdGkgbmFkIExhYmVtMRwwGgYDVQQLExNDZW50cnVt
+IEluZm9ybWF0aWt5MRQwEgYDVQQDEwtpZHAudWplcC5jejEkMCIGCSqGSIb3DQEJ
+ARYVcGF2ZWwucG9sYWNla0B1amVwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAvJIxOavTd0EX9/IM/cpWc/RlFw1wsDiZuN96yFRACjMeY0jxyF80
+KQJbSSUhgnBIXfeLcgOFBYMivtkxpKRw/dqIB7Pq0Reh9sdHvV0Kec7pphHhwiGv
+f5jz9OiqtP8ZfkK8dgZwJfjBhqjt6V5cHI5lGSMek0pH0KcrCo+yAhwtZecuDhTe
+xPHfBJ5UsQ9t/ynCQn6/NckOQrYIkeP9u+wS/XsF8Z5aB35Pjq6RCZCUqrWYomfg
+LpZKAjSikFyA/Er6UiZCXHysYkq1O4kE87ndhkN5ngtH6FBSJQO5QfG8BgrxiOCm
+chPtodxO++n1ZBhMVt4kHAC5txaEhhl9ZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAdNqOKtWjjw2L1YZ7hOxLNyZlAmboyDKeirErCXVK64QVCQvWZTl3BLDmvJzP7
+YbW0NeKq9STOfnxlJOV23NRPLjlaDwMn4B9wF6elNi+FeBplKt8NbXwXPfSSIHN7
+ytJJMwPrEBrrXhSKedT/rpGx28Ld4UuC4aKCjhCVor0fGh3B8BPQZoAY3iO+lXJg
+5jSx2xyJS9xVGE4sjeHrPTYNApQUKHboj4d2aswEQg+JvQYqdEU+SCBveo3Qou3Y
+6VLxR/4Su2F6qooWNjensavLeNix6/TurrOgMcIMOsJ1DcWml8HH2yBqEW40QNFQ
+U19RU7sLdrZ60inUFxdxr+AR
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationName>
+    <OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.ujep.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Pavel</GivenName>
+    <SurName>Polacek</SurName>
+    <EmailAddress>pavel.polacek@ujep.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
new file mode 100644
index 00000000..c266e5b6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.umk.pl.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umk.pl/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-07T14:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">umk.pl</shibmd:Scope>
+      <shibmd:Scope regexp="false">uni.torun.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+            Nicolaus Copernicus University Identity Provider is used by employees.
+         </mdui:Description>
+        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDejCCAmICCQC6YrVExu7BUTANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJQTDExMC8GA1UEChMoVW5pd2Vyc3l0ZXQgTWlrb2xhamEgS29wZXJuaWthIHcgVG9ydW5pdTEoMCYGA1UECxMfVWN6ZW5pYW5lIENlbnRydW0gSW5mb3JtYXR5Y3puZTETMBEGA1UEAxMKaWRwLnVtay5wbDAeFw0xMzA0MjIwODUwMzVaFw0yMzA0MjIwODUwMzVaMH8xCzAJBgNVBAYTAlBMMTEwLwYDVQQKEyhVbml3ZXJzeXRldCBNaWtvbGFqYSBLb3Blcm5pa2EgdyBUb3J1bml1MSgwJgYDVQQLEx9VY3plbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMRMwEQYDVQQDEwppZHAudW1rLnBsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArq1rEn9i3haxBrIM/h/8V20Ap+LeLeG9SNand3N5k6wTqfQMPHnhDoTSKg4iI1+Wlnlr91HCaUGTqGmuWZpSTmlLIgneKSkB3BZir7Yrz44mjD5b0OOBLKxoQQQrZiVE0Rz2Ek14WDLQ9reI6uBTFV39PRM2JSLCSbzlEO70+vJ1d6oxWwinzcL+wG8NApc2mt3VJgRwF15P2H7PKU1le03CdatY7GyHGqBllQuQ3aa8a3jbqZRlQ7BDw+HiuJGsWRoNKAQkci8SCLz7/RJX3XuWWRdM+DBGw7jALY/4WW00DUWaKv76nfsTqRwG8pySab4EQPoUsYGO196jTC9DVQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBu6pNnNvtILCiCgjsBjp7T2tWQLPLrgjpMD4yTBgg0IgQjP+wpLhwBB8huX6FfhySaedz9YXEphUIPN9ZuJyfonp+w1ITHtEguY9V7K06IkTpXJV4/LXjzV7iGVZ3tgvtlYz+uBT2kTdqJcCWBj860JMWP7BHJ3orQsGUka9QentVEtKMqvmdOfOXCd48NZYFvCg4iQlr2lHxPTANTKVf8+d7Js3+MFBqTSPLsRsDAknL9tZWTM+1U6toECw+p4dTk3u3Osn8Fkmbwg/AnUyNP9cfWW9YSHEbLzq0kFWP6SoViqzc2WYPPusaLELoZBZlqFp0dLtEcgQPasj2dJE+a</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umk.pl/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.umk.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NCU IdP</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>admin@umk.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unica.it.xml b/swamid-interfederations-2.0/idp.unica.it.xml
new file mode 100644
index 00000000..4322dd13
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unica.it.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
+                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unica.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
+                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE= 
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università di Cagliari</OrganizationName>
+    <OrganizationName xml:lang="en">Cagliari State University</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Cagliari</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Cagliari State University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://idp.unica.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Assistenza Tecnica</SurName>
+    <EmailAddress>idem-help@unica.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unijui.edu.br.xml b/swamid-interfederations-2.0/idp.unijui.edu.br.xml
new file mode 100644
index 00000000..ea633a17
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unijui.edu.br.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.unijui.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">unijui.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unijui.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unijui.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxDzANBgNVBAoTBlVOSUpVSTEO
+MAwGA1UECxMFQ09JTkYxIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUu
+YnIxDTALBgNVBAcTBElqdWkxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
+CQYDVQQGEwJCUjEaMBgGA1UEAxMRaWRwLnVuaWp1aS5lZHUuYnIwHhcNMTEwODEw
+MTg1ODEyWhcNMTQwODA5MTg1ODEyWjCBmTEPMA0GA1UEChMGVU5JSlVJMQ4wDAYD
+VQQLEwVDT0lORjEiMCAGCSqGSIb3DQEJARYTcmVkZXNAdW5panVpLmVkdS5icjEN
+MAsGA1UEBxMESWp1aTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRowGAYDVQQDExFpZHAudW5panVpLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL4ZMwDcJtiwQ7aE51xnBt0MsU5qRdilo2y1RLfR
+Ej67K2O9adt2T4Z+MLCPDljJazzS/X5iFiL0sm2iFrHovkkXVVRR+7T61WdKfFhB
+giWqBuLJNBscHPRrXLSEm+ZTG/RhOA028PHWilFXjKpYoNJYifsL1NOK9n+lS43+
+I7lam9d6xKQtqkZjsgeY4E07/bHBBjwYwvqC+HdVZQ6oJhz3iFNf3yMHDttT45Hy
+R9pA8ZWggyM7MektA+4fliQZd0vEUKVJyUkhOKnLK+BJPG1U77tfgm7J7FaKNCMJ
+g5MeEDN7H61pFKV4SKsLpkN+Dv4EA7JRlr5gex8HE3uMqgUCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEANYL2y1QNhq4JNs6jsyhHsLy2yFH9PAQuIxPw5uYo33O5oES/
+ACWvOoVEX+wz1Gyh29ODdb/osO0r+9/L9jhBaJCq1hhhzPn7kUuMry9qdDhMINN+
+5q0e1F7UKhdBEcXASpSB4zXFJkPkBU7Rh7lHi1cpyuTSk4cP8YYkUVUSVgAkDlOz
+1JuQIeCUlbCK8B5ArWEesVD5ts3MydnMsx1Qp7x85N/Q2LBGhsg+6T36KlzgLyar
+C6T5NDFKSyUeDSJ4XclC77MUAVqlE9K4aSbs1ui38aeDEeRrt3D4s0RNkN6XlBPC
+skHhy4NszUPhb3+BwKn/tExBYB5UE5fjWY7rOA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.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">unijui.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxDzANBgNVBAoTBlVOSUpVSTEO
+MAwGA1UECxMFQ09JTkYxIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUu
+YnIxDTALBgNVBAcTBElqdWkxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
+CQYDVQQGEwJCUjEaMBgGA1UEAxMRaWRwLnVuaWp1aS5lZHUuYnIwHhcNMTEwODEw
+MTg1ODEyWhcNMTQwODA5MTg1ODEyWjCBmTEPMA0GA1UEChMGVU5JSlVJMQ4wDAYD
+VQQLEwVDT0lORjEiMCAGCSqGSIb3DQEJARYTcmVkZXNAdW5panVpLmVkdS5icjEN
+MAsGA1UEBxMESWp1aTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRowGAYDVQQDExFpZHAudW5panVpLmVkdS5icjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL4ZMwDcJtiwQ7aE51xnBt0MsU5qRdilo2y1RLfR
+Ej67K2O9adt2T4Z+MLCPDljJazzS/X5iFiL0sm2iFrHovkkXVVRR+7T61WdKfFhB
+giWqBuLJNBscHPRrXLSEm+ZTG/RhOA028PHWilFXjKpYoNJYifsL1NOK9n+lS43+
+I7lam9d6xKQtqkZjsgeY4E07/bHBBjwYwvqC+HdVZQ6oJhz3iFNf3yMHDttT45Hy
+R9pA8ZWggyM7MektA+4fliQZd0vEUKVJyUkhOKnLK+BJPG1U77tfgm7J7FaKNCMJ
+g5MeEDN7H61pFKV4SKsLpkN+Dv4EA7JRlr5gex8HE3uMqgUCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEANYL2y1QNhq4JNs6jsyhHsLy2yFH9PAQuIxPw5uYo33O5oES/
+ACWvOoVEX+wz1Gyh29ODdb/osO0r+9/L9jhBaJCq1hhhzPn7kUuMry9qdDhMINN+
+5q0e1F7UKhdBEcXASpSB4zXFJkPkBU7Rh7lHi1cpyuTSk4cP8YYkUVUSVgAkDlOz
+1JuQIeCUlbCK8B5ArWEesVD5ts3MydnMsx1Qp7x85N/Q2LBGhsg+6T36KlzgLyar
+C6T5NDFKSyUeDSJ4XclC77MUAVqlE9K4aSbs1ui38aeDEeRrt3D4s0RNkN6XlBPC
+skHhy4NszUPhb3+BwKn/tExBYB5UE5fjWY7rOA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.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">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unijui.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Nucleo de Redes e Banco de Dados</SurName>
+    <EmailAddress>redes@unijui.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it.xml b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
new file mode 100644
index 00000000..267d4e4b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uniparthenope.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-02-15T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UniPARTHENOPE IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">UniPARTHENOPE IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+                            BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+                            OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+                            ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+                            teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+                            Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
+                            +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+                            kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+                            lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+                            n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+                            K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+                            VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+                            4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+                            K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+                            Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+                            c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+                            NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+                            cReeVaTfudJyy/pCjfbP
+                            
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UniPARTHENOPE AA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">UniPARTHENOPE AA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Autority for PARTHENOPE University member</mdui:Description>
+        <mdui:Description xml:lang="it">Attribute Autority per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+                            BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+                            OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+                            ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+                            teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+                            Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
+                            +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+                            kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+                            lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+                            n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+                            K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+                            VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+                            4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+                            K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+                            Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+                            c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+                            NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+                            cReeVaTfudJyy/pCjfbP
+                            
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università di Napoli Parthenope</OrganizationName>
+    <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>N.Napolitano-A.Cioffi</SurName>
+    <EmailAddress>idem@uniparthenope.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it.xml b/swamid-interfederations-2.0/idp.uniroma3.it.xml
new file mode 100644
index 00000000..2080f859
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniroma3.it.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uniroma3.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-07T14:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Roma TRE</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Roma Tre</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+                            bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+                            TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+                            8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+                            CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+                            k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+                            SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+                            x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+                            6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+                            AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+                            MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+                            bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+                            cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+                            cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+                            aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+                            G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+                            Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+                            bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+                            WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+                            wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+                            cTXFyKPFTrE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Roma TRE AA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">AA Università di Roma TRE</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Authority for Roma TRE members</mdui:Description>
+        <mdui:Description xml:lang="it">Attribute Authority per gli utenti di Roma TRE</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://idem.uniroma3.it/EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://idem.uniroma3.it/IT</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+                            bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+                            TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+                            8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+                            CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+                            k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+                            SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+                            x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+                            6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+                            AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+                            MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+                            bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+                            cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+                            cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+                            aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+                            G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+                            Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+                            bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+                            WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+                            wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+                            cTXFyKPFTrE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Roma TRE</OrganizationName>
+    <OrganizationName xml:lang="it">Università di Roma TRE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Roma TRE</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università Roma TRE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.uniroma3.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Technical Support</SurName>
+    <EmailAddress>idem@uniroma3.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uqam.ca.xml b/swamid-interfederations-2.0/idp.uqam.ca.xml
new file mode 100644
index 00000000..454362a6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uqam.ca.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uqam.ca/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.canarie.ca" registrationInstant="2013-07-22T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="fr">http://www.canarie.ca/templates/services/docs/CAF_join_fr.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">uqam.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">UQAM | Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students, employees and other UQAM account holders</mdui:Description>
+        <mdui:Description xml:lang="fr">Ãtudiants, employés et autres détenteurs d'identifiants UQAM</mdui:Description>
+        <mdui:Description xml:lang="es">Los estudiantes, los empleados y otros titulares de identificadores UQAM</mdui:Description>
+        <mdui:Description xml:lang="pt">Os alunos, funcionários e outros detentores de identificação UQAM</mdui:Description>
+        <mdui:Description xml:lang="it">Gli studenti, i dipendenti e gli altri titolari di identificatori UQAM</mdui:Description>
+        <mdui:Keywords xml:lang="en">uqam.ca uqam montreal quebec university</mdui:Keywords>
+        <mdui:Keywords xml:lang="fr">uqam.ca uqam montréal québec université</mdui:Keywords>
+        <mdui:Keywords xml:lang="es">uqam.ca uqam montréal québec universidad</mdui:Keywords>
+        <mdui:Keywords xml:lang="pt">uqam.ca uqam montréal québec universidade</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">uqam.ca uqam montréal québec università</mdui:Keywords>
+        <mdui:Logo height="16" width="48">https://idp.uqam.ca/images/logo_uqam-48x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="182">https://idp.uqam.ca/images/logo_uqam-182x60.png</mdui:Logo>
+        <mdui:Logo height="647" width="1960">https://idp.uqam.ca/images/logo_uqam-1960x647.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fr">http://www.uqam.ca</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fr">http://www.instances.uqam.ca/ReglementsPolitiquesDocuments/Documents/REGLEMENT_NO_15.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>132.208.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>uqam.ca</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:45.512843,-73.560893</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
+fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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.uqam.ca/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uqam.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt">Université du Québec à Montréal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Université du Québec à Montréal</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUWJxXbZuGIlRqAdUeM+MQM60cBjIwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLnVxYW0uY2EwHhcNMDkwNjAzMTUxNDI3WhcNMjkw
+NjAzMTUxNDI3WjAWMRQwEgYDVQQDEwtpZHAudXFhbS5jYTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALTvLffPT+7KOUB1E4/VfYGDMTj8qyRceKedTLxG
+5y1gVngrl1wi3s3qF7aDV8P0SJmJJTtOplxnNNUCTPFyEtKD8TtUAL00Uk2xqB7c
+zgXjXpa5LB0obAz4tkOrrpD/WAffCfjaxiUY7JngPozOsvjCfCp/Yh77Q7wfa1Zx
+Dx65/vQCcgFUaXxcb7vq6ilohDcjQPzMJJvfFjJK2Rg+uNPoEbms15ebQzHfQ4Ci
+UbE+vQ5LxkruxNnOiq0d/C4hizKn5uC7oPxNjpEFe4y5cv5BG78KHkr9sKcWSVwg
+0k9ZtvXS2zGkQPM24f8g9WaF389JJlExaqKms+NPZyNpBqkCAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLnVxYW0uY2GGImh0dHBzOi8vaWRwLnVxYW0uY2EvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFDVR7RoTZA/UsE/TttH8CaUzxeQ/MA0GCSqGSIb3
+DQEBBQUAA4IBAQBoEgpeo8w8SCBHmi/ShGkcMB9A2JFCpUfspkNOQQ7GSAsl2ix1
+/nY0120ooY4V7OWaRyRMkxtL9ycKwMMbJBREj6qiZCeDh4fy5KtyWJePI0+piKUG
+NMl4+fKSXD27kO0aClaPkYiSZeSWfoZEFWq+99FJ8A9uyr9lTyjjkXil87LfoYdg
+iJPe/MZXHYtLYGJcpD8eaIBshbjWWetxlfus6fDAkmu2cVZGwYiMhT/v0CTzhl3C
+l3HcCJmuresheZwe0OdBG9Qh/VHQeOftbJD/6/HhmHBZMJE33H3x8b5ZurP3oxFO
+fiFLy80FQ90W2jDA5xLADjiDZY7BwQMSmzLn
+
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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">Université du Québec à Montréal</OrganizationName>
+    <OrganizationName xml:lang="fr">Université du Québec à Montréal</OrganizationName>
+    <OrganizationName xml:lang="es">Université du Québec à Montréal</OrganizationName>
+    <OrganizationName xml:lang="pt">Université du Québec à Montréal</OrganizationName>
+    <OrganizationName xml:lang="it">Université du Québec à Montréal</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.uqam.ca</OrganizationURL>
+    <OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</OrganizationURL>
+    <OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>shibboleth@uqam.ca</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz.xml b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
new file mode 100644
index 00000000..9ae5630a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utia.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.utia.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">utia.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider UTIA AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTIA AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utia.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-utia-44.png</mdui:Logo>
+        <mdui:Logo height="411" width="960">https://jiftach.cas.cz/loga/logo-utia-411.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.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.utia.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.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.utia.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.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">utia.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAPWAIIDpvyOIAKgxvS8uAGvErbFIMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejAeFw0xNDAxMjExMzQ5MzFa
+Fw0zNDAxMjExMzQ5MzFaMBoxGDAWBgNVBAMTD2lkcC51dGlhLmNhcy5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIMlroofDB1hzFwO3vg/GyYuWHzq
+ltlkURfEPJOAnKG/W2ax+ljT+4OvFochFR3Tn2z9k9BzjK2TNbK4SSHnojSn/7ml
+UEe5GcSqUzWRz7N6IPWqq95bpHAjttP9GChbwn9TWbiim+rom7azfJ5GMNpECE6x
+J6hnZLLqe9tH3MRjHq/g1EgoYwkRN4p+GH50zpPfZmqdChoxN4+ipiwodGHUGLbK
+qjrCkusd3nx9hjkZNsB9Xwcws4HJhnfKmUaRXccBeXI+93rOVTVgRdzC4AoV18xZ
+DT4mZJHi0rAr+S8k/qHpYapp4BJX8FlGxzfUM/KtJft6aupc2KkacFeJzXkCAwEA
+AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0aWEuY2FzLmN6hiZodHRwczovL2lkcC51
+dGlhLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQULF0CAFze9Eoavjce
+J1fkA5ZwtzEwDQYJKoZIhvcNAQEFBQADggEBAEdPs/pVXrBbxB8Gs7V3a9gGn7Va
+4svNZ7mosAAWvlXPLGKzdmp8GdqH1UNjNZouxSXJDVC4sbOKcFiyu7gr+Bc+SbhH
+vd5/D4EzzaF5LrfCcy4z0z/Z2GmoejJUkysYTnvfDJwUk57JKfeF7JP0WTxtGwBX
+us9wwyhp00Lvq91NAddg0YCHgYkNNJ+nEqinRTUHtF1/NM0kOxj5Bldl+Ea5ofMi
+4xHhOx6IKjHfhU+xSBtA5JalGefjXT8reS2EPc8NY8YQE7fxytldlc3C4nkLilwp
+p6lZaMAngitaUamaZdgJTVokp6H6D9o6qommaXW6BFw0RskMVAO4QKWnanc=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.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 Information Theory and Automation</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Information Theory and Automation, Public Research Institution</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.utia.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.utia.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.utorauth.utoronto.ca.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
new file mode 100644
index 00000000..bd1582bb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
@@ -0,0 +1,101 @@
+<?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.utorauth.utoronto.ca/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-05-23T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+http://www.canarie.ca/templates/services/docs/CAF_join_en.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">utoronto.ca</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Toronto</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.utoronto.ca/about-uoft.htm</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>utoronto.ca</mdui:DomainHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
+MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
+JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
+x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">utoronto.ca</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDTDCCAjSgAwIBAgIVAKBtctYdDHOwvkS2Cae5mn6+SG12MA0GCSqGSIb3DQEB
+BQUAMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0aC51dG9yb250by5jYTAeFw0xMDAy
+MTcwNDM2MzZaFw0zMDAyMTcwNDM2MzZaMCMxITAfBgNVBAMTGGlkcC51dG9yYXV0
+aC51dG9yb250by5jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsi
+lyIZHSDZPNT7GJAnB6sydHDoezYsO5k6OqQaY1iVJnx8dFkY+mdI5zwmUgDV3LKY
+M+vh/1v1tDx/5G6eVPckZPn6WobTd+GQgwUsXFRGZ5svkHSxQhAzBuc4ltFAFXPI
+JnbgD29oukIE3S6YCo7pQBORbbizsoHbwZ2pzk1u6iEbf7DuiPy8i8+CjdHHs3BS
+wXJ9cG7Yah9ouXK8g44Jy6KqoFKhPckKbZfJ2reojSAQEZm4hu6Rn38PRSAIFJFb
+HFZlqDpvFnLwQXkrB1bcoWoePPRjwkUPWqPjOkqBmTgSRlitKNUpnrQMjzckTaVX
+70r73+hA2L0YbWp2Xt0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLnV0b3JhdXRo
+LnV0b3JvbnRvLmNhhi9odHRwczovL2lkcC51dG9yYXV0aC51dG9yb250by5jYS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUrp0AR4X36F4QukpWTPrl7SpIVLUwDQYJ
+KoZIhvcNAQEFBQADggEBAJl0Wi8qk8D02AaPu0XdqoQekjvmZFyi6rcoCKDzCKWd
+jyuF+gqEPWIWg+Ee8zqVvx0XNXx6YqqU5WyXjp1vvcNTE33+kq8eCMGWHrpW+mwn
+FwMXexviS6z/TLsSMwTbbTb7G900iMl81B7++v9KkRzg5KSx3UILKr3t39hmf/nP
+v6q8Ut3UQ5EjnV5J+PTDePSSVhsauAqQgdXJk6e5D0Y6BOYQGKsncBvmmz3LRuEO
+JA6YHVtPjl1wNwGOMImUX4ZT0G0YAGrxx0VN7rU9RCGlLaasDFQCIuNrOOM94w6W
+x5P0oxvLtqiOA5Sbm0KW5p7Fpzig9Hm+7M5dxGJd0L0=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca: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 Toronto</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Toronto</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.utoronto.ca/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Mike</GivenName>
+    <SurName>Wiseman</SurName>
+    <EmailAddress>mike.wiseman@utoronto.ca</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vib.be.xml b/swamid-interfederations-2.0/idp.vib.be.xml
new file mode 100644
index 00000000..685ce972
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.vib.be.xml
@@ -0,0 +1,95 @@
+<?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.vib.be/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vib</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
+OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
+//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
+g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
+IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
+SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
+FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
+BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
+Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
+SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
+81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
+0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
+VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vib.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vib</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDFDCCAfygAwIBAgIVAJDe4t8YsctH2JGBPfdMqwdkUTh3MA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC52aWIuYmUwHhcNMTMwOTEwMTI0NzU5WhcNMzMw
+OTEwMTI0NzU5WjAVMRMwEQYDVQQDEwppZHAudmliLmJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAjX9kGhK6nYxWvuNeuNdGuU2xyEsUyTEE7a3+vWG1
+//IcBPi6b0KXBYOKysqTekzYsoNiSxi9sup5Yx6lgS+nqHoM+ULqyKH5t78HctvB
+g5R4WGNQ5QW01uw3eLZ5OaCnyb/XXwYhUdZJraaFL/R5sSzkwHRkJ5XN1kUjj3M9
+IIr9Kquc6/gbvZj0P4dRHB8WTkboKoC71yF0lJQtiawK5mmH6kmnnR6hNe7+PPY3
+SSysNjOWscyBKXvLQiyC3/5a7ILzWTo9xAwoDvl87JnlgrZaNTbcVpugDufOI496
+FIq7kMHqMJVxcBht64HXHQ+jdiAL1Fga/zmd2nNbi+1a3QIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAudmliLmJlhiFodHRwczovL2lkcC52aWIuYmUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFCvlrzRYM0OZ/HvA0ZUxTRM3tRUPMA0GCSqGSIb3DQEB
+BQUAA4IBAQAhQdI6woZQyn6p9LAr9IEjc+6CvYLq/SRLK651E/D1j1C3NznmPf3T
+Wc8cMRy5g6EGmuIUk7BIo55eAIH95AgXNbvC2/OEkmwDtMV1nDV/rP3XWp0WzOhL
+SkG9fvuA/Mm6v6UtLW6HDRu6GzZPNPegDdSbJ01xpuOaF+O011U2ThaXZFHv+3fw
+81HKd3ZJ1cImeP4gijREmG7Go+Vq2ROM8/+3f/VhYSOgJU9g6ylkxKLKcxAeyg5J
+0BNkUbCgjbqiU1mg5oV7QYFyYKhOO0vJPFfv5DeLIfCdKFo7Hw/HzI3Y+Afjy0+L
+VJxJ/lqmkwOe7YkIk4wBzp6DTlfsek98
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">
+VIB
+</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">
+VIB - VLaams Instituut voor Biotechnologie
+</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">
+http://www.vib.be
+</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Jasper</GivenName>
+    <SurName>Minnaert</SurName>
+    <EmailAddress>jasper.minnaert@vib.be</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
new file mode 100644
index 00000000..c7a18791
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2-1.slu.se.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2-1.slu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</mdui:DisplayName>
+        <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: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>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
+GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
+lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
+o04ltBnMhQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2-1.slu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-1.slu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIUIDSi2H8dePffTFkVUjtBaLv6ctUwDQYJKoZIhvcNAQEF
+BQAwETEPMA0GA1UEAxMGaWRwMi0xMB4XDTEzMDMxNDA3NTU0OVoXDTMzMDMxNDA3
+NTU0OVowETEPMA0GA1UEAxMGaWRwMi0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1L9PRiIOUnTbMQoU0LwTtlSeQLwvXbu87PfFMTTpQgdUBrMCPDWL
+mrT6Wko9WmGoAGkYft7bMjFDEkA03Cj5qTbFtemN6Jp/ZqieDnh09wxBdfzOAkSv
+jSdHQK08ITpH91PYtubd9Id6sEI5M6oZ2gSqim/BitjEOh2X1pd5wlLRCtX+YKPE
+UhOdHOuxFfiZALpWoQDWSID0g+yOc9qPj9BvO4gE+YsHbVw+T4f+7IdMEQj+WX1e
+x6EDWSJ8yjRc8RyCXw3AtGWEaCU6NkL5ksTV7DfkozWDjfF6srFck6ksDKN+EEZ4
+wBC+ZCRevaqO/BRfQmsn3JxWRUU9ddTP8QIDAQABo1MwUTAwBgNVHREEKTAnggZp
+ZHAyLTGGHWh0dHBzOi8vaWRwMi0xL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTs
+FaVVn2xyoTYbOGdkDDdtFV8ErzANBgkqhkiG9w0BAQUFAAOCAQEAVETKawYhusol
+wIP2n2bnvKoTD8wJPZNUpxvxBeY72Ux9tzILAdnaDY3lPAwaslqGN7Q3MEVIPbA7
+ebTyR6KPprv3/ijN78HA2FpuIumCiMwgcKTntA1ti8TkCknc/p25yuSJm8kk1YYT
+EI/cBEjV7AeP1NQXVkxyj9zwY0dYzax/h6Wg+t7qvs8ORxOJdEhr1zdsxY1f+7Aa
+GH/yHRavwkRh3ICgDSty9dO7c8k5MXjnX/W+zZR1/IngJMmUKZXIoLmqwdaHPb+S
+lb1DOdXnNxi+WNQXbBjzonEZa0hFPT/ml32QpjCzh11edlGltCnQVzyLJGw/W5KT
+o04ltBnMhQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
+    <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>
+    <EmailAddress>saml-admins@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <GivenName>SAML Admins</GivenName>
+    <EmailAddress>saml-admins@slu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>Help Desk</GivenName>
+    <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
new file mode 100644
index 00000000..bb1bdf4d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.civ.cvut.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">cvut.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CTU in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.cvut.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cvut.cz/cs</mdui:InformationURL>
+        <mdui:Logo height="40" width="53">https://idp2.civ.cvut.cz/idp/images/logo_cvut_40pix.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>
+			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
+			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
+			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
+			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
+			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
+			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
+			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
+			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
+			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
+			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
+			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
+			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
+			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
+			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
+			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
+			    6w==
+		    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.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">cvut.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+			    MIIEfTCCA2WgAwIBAgIRALXH4vfn8/gr0Iw5Iowy/gEwDQYJKoZIhvcNAQEFBQAw
+			    NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			    IFNTTCBDQTAeFw0xMjExMjEwMDAwMDBaFw0xNTExMjEyMzU5NTlaMFcxCzAJBgNV
+			    BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+			    cmFndWUxGTAXBgNVBAMTEGlkcDIuY2l2LmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+			    AQUAA4IBDwAwggEKAoIBAQDIAANNkRJrnWIbXPvPd1g/2Dlj8SObKDs4aLG90fkl
+			    7XvId+XJ71GJ8aEjJ9lGAEqs2a9sgm2WpcLQ/B+Y9veRyRtnaK0Ywd8+iSThsA58
+			    oTN5H3V3m/M0oMTd9UPkQSHCLUn+Dp1w04DJ6J8ECWoI2rvIblGHGzxfzF4cb2KH
+			    aMvWDGSuiQh6GeKkwHDTVTr9pZK8Evcw7RT/4KlChf5hfFD3ZwGsrWCjI25NrR+6
+			    753XeaVIOOCKZladSF/93t8kAM4Z+n/ijQDytg3v4poSt0LM5X4+8b7AYTDSjkUq
+			    Nh36JZ+OZY4jRrBsrM0S4RXWuPB9DEc8hLe/CIRZWGIzAgMBAAGjggFjMIIBXzAf
+			    BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUWkdTT+6T
+			    qjlT9i5aI+IBxfKpCm4wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+			    VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+			    MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+			    Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+			    dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+			    BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQaWRw
+			    Mi5jaXYuY3Z1dC5jejANBgkqhkiG9w0BAQUFAAOCAQEAvV4rEv6A07BXcUMTF6+z
+			    Da8v2shV1S+f0SGfIdL1DzvaUFf7VAWuKOlwny8OfpzXVCs3yg+KSDWUWi8HWR6y
+			    dKWsuHljnD2DxAAPQNZeuESbPSyeZK/EJdSu4Ii+OH0exDRjZjZ3v3VsoueQ41tt
+			    1/Fji03+9bZCQi9dOQpQji/q2SrnKRpPsoCemY+bo8E7SanrUd7jwX1ef6HaOnTP
+			    l8oHphtTzvbg+i3qaTH9bDQXdXbcFZPklU7+5k80wHe56+1sECQ5g1lB+ZFzx1Oi
+			    i5rCf/Zx3bkYkE+xPXAOcCGEWs35at7QpIXuoG9FDU8UKW2cMgEq9GEOddx/wVqB
+			    6w==
+		    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.cvut.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="cs">ČVUT</OrganizationName>
+    <OrganizationName xml:lang="en">CTU</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague</OrganizationDisplayName>
+    <OrganizationURL xml:lang="cs">http://www.cvut.cz/cs</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.cvut.cz/en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Strupl</SurName>
+    <EmailAddress>strupl@vc.cvut.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
new file mode 100644
index 00000000..2926376b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk.xml
@@ -0,0 +1,109 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SDSS (Fountainhall)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This is the identity provider for the iay.org.uk domain.</mdui:Description>
+        <mdui:Logo height="80" width="80">https://idp2.iay.org.uk/images/heads_80x80.jpg</mdui:Logo>
+        <mdui:Logo height="43" width="100">https://idp2.iay.org.uk/images/heads_100x43.jpg</mdui:Logo>
+        <mdui:Logo height="104" width="240">https://idp2.iay.org.uk/images/heads_240x104.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>217.155.173.104/29</mdui:IPHint>
+        <mdui:DomainHint>iay.org.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.9328,-3.17905</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
+						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
+						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
+						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
+						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
+						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
+						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
+						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
+						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
+						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
+						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
+						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
+						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
+						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
+						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
+						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
+						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.iay.org.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.iay.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.iay.org.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iay.org.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDSTCCAjGgAwIBAgIhAMSPOSGN+3UUTXSKV+2EBOuF3x/pwPX/TD9GfyEkzLp+
+						MA0GCSqGSIb3DQEBBQUAMFgxGDAWBgNVBAMMD2lkcDIuaWF5Lm9yZy51azETMBEG
+						CgmSJomT8ixkARkWA2lheTETMBEGCgmSJomT8ixkARkWA29yZzESMBAGCgmSJomT
+						8ixkARkWAnVrMB4XDTA4MDIyNTEwMzAxNFoXDTI4MDIyNTEwMzAxNFowWDEYMBYG
+						A1UEAwwPaWRwMi5pYXkub3JnLnVrMRMwEQYKCZImiZPyLGQBGRYDaWF5MRMwEQYK
+						CZImiZPyLGQBGRYDb3JnMRIwEAYKCZImiZPyLGQBGRYCdWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQCb6ts48g10XHTnpy+23huzR184aahkrG0AoeUl
+						FVlomPjoFDk6czq0S3Qyd+ceF7tMRu3XzS7cMmtVH53O9d+wCs8aPQcPXxHQ5gLk
+						L7Gu6eJ+3N3jXhpt7/DDPhnzFPNW3EVMueHJ/0IzyspTvq2LPbNWXJ86NKJ+gesZ
+						QftskwXScOjpoJEIP0EA890QYd4WdYtQPqVV+LPKtnYBoGOnuRhSAM1D/EhCbeb0
+						lCmRGcdGbDFBchiPO4VLGl85sLa0EhjxMIPAOKXcj8bBlO9Ww9kkG06kQp6eLHwm
+						Jmt7VNKveCGhyF2QH/CvmdUaPv3gcp1UjrlqFN9LBVSaTIL/AgMBAAEwDQYJKoZI
+						hvcNAQEFBQADggEBAG+jDBAtlKoHaEBB+l6PpW5zuiDjyHG4zZZYqX77mZ9xP/xe
+						Kn0yJ18ZLjS3b9WztGLYyC4SJHSF2okq1K02bqsCv9YeP+UWpw2uRR8jt96lLWxZ
+						jTjoko2v8jBtzDk8LZsqw58m4vZ0AGNZjKeGIywKhxnepwREguyj3bjBpZAGgl0M
+						HQuXoO/BDC9yKyZslE5CpWp5xP4XzY2/LrorrkwOJLnFuk1sox4/gvkDQukUx/jr
+						YRbrWfOjcNBx3LE/HI6RNLINicK7yUwerDE86nix5Zc3hskVcCykW+r6HbY6bx7P
+						YmNKYMZhQAgDtXIjFHOy+WbyVTidmJvxM9UeYCY=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.iay.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Ian A. Young</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SDSS (Fountainhall)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Ian</GivenName>
+    <SurName>Young</SurName>
+    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ian</GivenName>
+    <SurName>Young</SurName>
+    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
new file mode 100644
index 00000000..86a2df90
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for MU</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro MU</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://idp2.ics.muni.cz/logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
+BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
+Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
+LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
+nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
+0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
+s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
+zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
+IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
+O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
+pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
+r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
+SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
+11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muni.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEajCCA1KgAwIBAgIQEi8JxmnGiL6xNZ8O2MTYZDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxNzAwMDAwMFoXDTE1MTIxNzIzNTk1OVowRTELMAkGA1UE
+BhMCQ1oxGzAZBgNVBAoTEk1hc2FyeWsgVW5pdmVyc2l0eTEZMBcGA1UEAxMQaWRw
+Mi5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQd
+LDOtSIbIrXUepE/6tvHPC8Ly7TjX7qfkaY/1qd+9QMgXNniLApfu9kCl/ZubelQJ
+nJbx5GJaxuS1RRl0Nuq5zf52OnOQxFrWtmrzticEMu5P1rDKcuQh4uk1Nztla599
+0xWUwVM3oZUQl4+O477j9bN5yvIVB4gsIp5Fj9rplt9lc8qud7nA6qxzM1UjE5eH
+s/NCsnTh5Ce6ocP1zEhVZBcG0yXOenWGo3LzclMk9Ffy8wnJ4fLaoTGVON1n31Dk
+zg3YJ6hxSo92X+iwdfYLoHVTPe6rQDxT7V8vO8zRdDqzvwRn39nSXrtGOp6bCXbk
+IrEo3UH1e490sCkkRVMCAwEAAaOCAWMwggFfMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRBJryty03ccYy/kmP60rnahOoGVTAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAyLmljcy5tdW5pLmN6MA0GCSqG
+SIb3DQEBBQUAA4IBAQBSfzF1XO5gVygzYna/TZwXE1DUJfiTTiK8YYeU+bDKffkf
+O2+4F/N5Jij4C3s82EHP8otVXA4uXGWVvqbLCN+dSkN5zAeE7Hq48m1u/nYVyCKf
+pgLCkrg64JqIPIm8yF+bu9cvU0MbkzZTFCvbxnfqBQCKKfQ4Q6j3MiW12pfifIGe
+r+OsRrA4ZCo+6qGhA3bRfozFYUHCdJA+MxJhZzfcMae1MxK24wGMTSEabFlu6evm
+SJdlV4XPhmyysjuIHh3SnsS2NHpv0l04pT/JJV4shfZFHwqQS06ggNtpqysl3Y6O
+11KVcl/v2z6hhhjdrelepkLFCGKUVgpSOlcImQNb
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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="cs">Masarykova univerzita</OrganizationName>
+    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Radim</GivenName>
+    <SurName>Pesa</SurName>
+    <EmailAddress>pesa@ics.muni.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tomas</GivenName>
+    <SurName>Sapak</SurName>
+    <EmailAddress>sapakt@ics.muni.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.idem.garr.it.xml b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
new file mode 100644
index 00000000..eec138f8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.idem.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-30T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GARR Firenze IdP215</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test Identity Provider for GARR IDEM service</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="it">GARR Firenze IdP215</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider di Test per il servizio IDEM GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
+                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
+                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
+                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
+                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
+                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
+                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
+                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
+                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
+                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
+                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
+                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
+                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
+                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
+                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
+                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
+                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
+                            gh97
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.idem.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.idem.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
+                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
+                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
+                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
+                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
+                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
+                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
+                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
+                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
+                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
+                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
+                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
+                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
+                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
+                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
+                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
+                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
+                            gh97
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GARR</OrganizationName>
+    <OrganizationName xml:lang="it">GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GARR, Test IdP in Florence</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">GARR, Test IdP Firenze</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idem-help@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se.xml
new file mode 100644
index 00000000..69f4a142
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.kau.se.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.kau.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+        <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo height="112" width="112" xml:lang="sv">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kau.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
+        <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
+        <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
+        <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
+7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kau.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUUONxidNrozH1GiZ1VI/uwwgWM8cwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwMi5rYXUuc2UwHhcNMTAxMDEzMTM1MjM0WhcNMzAx
+MDEzMTM1MjM0WjAWMRQwEgYDVQQDEwtpZHAyLmthdS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAILFxLkJloiLact4UjsWKH98lOkzm6VE2t9GQtUe
+DRYCY5prnaDRmsumqmMYLMZXT6DCT99oNLeeBeBfB+8JwqraYhDanGiRAENTrlbs
+jUTx4p5BYTBuo0rGpVZ8MBi++f8ainvxPI4LGVc02upuG7lhWnjaui2qpKQf9hFB
+mqnjgL2ohS/Jhzo7q5XiEtsTtoD4ssUMabbzK9Zc5x6/txxJVAaicOHhqgXhFkkD
+AfC86PbWim6S8BpX0f8ERcYYKAm58ES/tpgZeImVmIIyHAIHPukjUKXNzuDKh9qa
+3LXp5moCeQKI385mw1BnkwTTqdwZ0Y5QHdYIMfB59VuUPm0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwMi5rYXUuc2WGImh0dHBzOi8vaWRwMi5rYXUuc2UvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFLywmXKV+OaPFHmRtKgA7vepw1CtMA0GCSqGSIb3
+DQEBBQUAA4IBAQBRG+Zr9oXM/S7WHGRlTuwcXLEqy1jETAre9e2JUJLCYeEQdUor
+W5fETZtgs1DwGvfuquLRFxvIGtnIgELy1Q9eDGszursIl+cY6kv72pl+wP+QvI0U
+GWysjsYepf78eRQ4sNKn/m+2p7ZBfLFixNdTn1nvIGSaPX+8SnOrYfrqLYXZVZuF
+HntH8R43Oh0amq0BYWSJOhhmT4nxpvwwQCETd+RTqyB0SDtXnjYKv7j505JEBltt
+GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
+7FShqSitkM9DR4N7PbfMlbcB71JnezGMtokE
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">KAU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Karlstads Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>webbteknik@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Karlstad University</Company>
+    <SurName>Paul Scott</SurName>
+    <EmailAddress>paul.scott@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen Karlstads universitet</SurName>
+    <EmailAddress>datasupport@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.redclara.net.xml b/swamid-interfederations-2.0/idp2.redclara.net.xml
new file mode 100644
index 00000000..8f091bee
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.redclara.net.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.redclara.net/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">redclara.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedCLARA</mdui:DisplayName>
+        <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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net: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://idp2.redclara.net/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.redclara.net/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.redclara.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.redclara.net/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">redclara.net</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net: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">RedCLARA</md:OrganizationName>
+    <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:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Carlos Gonzalez</md:SurName>
+    <md:EmailAddress>carlos.gonzalez@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
new file mode 100644
index 00000000..918fa685
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpcafe.ifsc.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">ifsc.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsc.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsc.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.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>
+      
+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==
+	    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.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">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Diretoria de TIC - IFSC</SurName>
+    <EmailAddress>suporte.reitoria@ifsc.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br.xml b/swamid-interfederations-2.0/idpcafe.usp.br.xml
new file mode 100644
index 00000000..6d309e40
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.usp.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpcafe.usp.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">usp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
+        <mdui:Description xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
+T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
+cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
+Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
+IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
+TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
+CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
+7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
+wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
+NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
+kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
+Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
+WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
+ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
+kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
+4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
+QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
+7UdfUKFbnsb/9jdfwzk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.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">usp.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
+T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
+cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
+Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
+IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
+TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
+CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
+7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
+wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
+NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
+kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
+Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
+WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
+ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
+kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
+4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
+QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
+7UdfUKFbnsb/9jdfwzk=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.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">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
+    <OrganizationName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.usp.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.usp.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>DTI - Departamento de Tecnologia da Informacao</SurName>
+    <EmailAddress>consulta@usp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff.belnet.be.xml b/swamid-interfederations-2.0/idpstaff.belnet.be.xml
new file mode 100644
index 00000000..7b30b1ec
--- /dev/null
+++ b/swamid-interfederations-2.0/idpstaff.belnet.be.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpstaff.belnet.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">belnet.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Belnet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Belnet operates the research and eduction network for Belgium.</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wDHQktK8+8G0YAAAG+SURBVDjLhZNNaxNRFIafMzN3moxp0iollRSpGqwuuhNFUhSFrgvdSOsPEH9G967ci+CuIIUixYXQRZFC8QM3IlgoqQgtuKhNSSfOzL3jIhM6M2nigcuF+/He9zznHmHpZUwv4hhEGBq5M9bAy3F8NtIhkllzMhuAAK5t4SkbZQunoeY00BhjumdyBp28+NNHMyzemaZSVBSVw7Ef0Px9wpudJu++/iLQZkAKgLIt5mdrzM/WuF4t49jC9ESJ5UadV8/us3D7CuQySjHo2ehOr7d2ebiywYOVDdY/7zN+YYR7N6pDUpCsdKhj2qEmAvwgAuBvqPuKkmIgGSdLjWs0ZqoUXZtbtTF+HByzttPs7gvnM0hHuxNx+MfnqB0QaoPn2lQ8RR5Cv0CivvaxyeMXmyw8f8/q9h5Tl0os3r2KZVmDy5iviKdsRguK0YLqvmbJMAYZAzyZqzN3c5Jxz6U+WebED/jw/RBjYkgJZQQibdj8dkC1UuSi53K5XKDVCXn75Ser23usf9rv6xXJNFMCpTRiU3IdlCX4keHIDwkjnXxlGZ6CAVodTasTnZVMJLH9Pwa9jpSEhpxDJ9e1/wBQnZONeR0FdQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAIAAADsyLLJAAAACXBIWXMAABcRAAAXEQHKJvM/AAAFOnpUWHRSYXcgcHJvZmlsZSB0eXBlIHhtcAAAeNqtWEmWpDgM3esUfQRjeYDjEAHs+r1e1vH7f9kEQ5gMoqqSTBJsWfqabeTXv//JP/jxyanoU5fcZ5e6pOmRYg7eJZ9iymlIs04+z8vj8Vh8xviQAkdi1hgmdWHKLiho+zRI6POYsTBqHsMcQ8J/MFTFIp910dmN+sy9jrlPWJgmCkudd3xPzzRn5ZxQAtCEtBCHjmXiRQ4klZUHTdIx+hBCOrHBnGCSrPoccDkdsXTJ9uPnDCo/pwWE2S/a6cALT0497h73qQjwk2TNsAWl595PlIB5Q+FG7zYkgAHTQHGfhuxAP0CHeUMmpggs08DlYFWfnhsm0uEesTBSeQKAYGD1s+jLDt4RgTEdU7LFE3AGnSEdT/BjBJsRBodP9VkYr7SyEh8ZETr+IHmdOajZpee2pszJOolFw6qxvXVphlwobLaDhSC5y5EsqEHwpuJM78YlqIQpDuFBoHuWexzbzBHJphzxy16Bw6Kml669KVfuLPHKWH73pwXJvIUxnlXwOAFHD/1dcaS6ox8ruzHUaE+MOfyF8h/aIPQc3I+FE+6IUkRsFwOeg46MS9wdYvvBcXsuyjcZy55zAwPNOaSUh6P8d/FEpDv5fRxPUhus3gQqAzKW6U8SPykse67vTFuyKxUCJdJrCwJ4Dp28XOjCALc/Wf7gaL8SY1yjAs1e4QY7Ib8/DUbSyc/BGCbU5j8JSDCcWmFpjMfAUqgWQ2ABm8KjonMh8aw67BJj8AGdAGbxIYVOe3glwlcddOhx74Ivd8yRAq5R/ArM6EKHwW4z57XcC4SBxtb8KpskhaWqKekZmHKxggtGpTZV9OGMXr6Bv6Fnu/TLHp/sANL9Q+mwUOdJwGe8sGjEiKFRsmcW9GhSnjYaqmFDwYF3pIPhjHh2hIKRyCV47N9saQDkE4KWcSPj2uy0xiC8xjKfaa8508zMHRramcFPslsM1vVy6dBoCZKwFC8mYtp5FLuXjHjF5iPkgZ3ONhHx5Gif1x5ySBrElGFKraSR96xpJw23REW2X86C+Y7dyLppePXTTfKYmtG9DwGMkha5pnxEHWTZcdgksCJmZcmZ4GpM2hj6vqJG4cI7L4zg3dxhguUnyRcom2Ei5+yxSO2tHneGjPgYvx+SRw65/1HuBUbb1vx2dh2TS25n1wnBGYDchZ9/SA+mlzTz6zaDbacknzPsXruST/3qql2lUzuV0i3v9a6ShanZkaW9uWoToyJZ9KOABMy5WCpYIrVwq2ADtv+3DebXTMhD/kbfJ51c9/0Yois77TvWk2YRCzyJ8PTx3v0r+zFwDcoR8CjAeBb/iIaSGEF5s9UM/Nyes8O+WsAVE/KQFpN7GLg8mjuorJR+YGmAk9v3SFZWPPidWF3gQZCUoxZzbL93KRRyJrlgw8NYv9JF4MEROu77nJwb3Xd9LjDObHModzPspz5HdlKLmpbA3I7G++JW5Y44dc+onQNYDfXK9XwCrx3I2gxSb+Ylg6ClrfV15/2ikkJ2gYCeHCw8p5LKdkzmmYiRp3tWclywlc47Xnvb+q3kuD/raYQGn/YBcch8hmD+4ZQNFfhdAnF6fVjeM6xr7JuAlEZUtwOfz9kHLHsTyCel7hY9+bZ71Pb1VvDkm2jel7ozUvmd+txCKrVRf9HXyoqKU1eMUh3q6oev0mTQcJj1aEI4rW6H1ejKZzGLcG+tyucB6wd+P1o/C1yyuuc7KRbZE5bPceUTHQ1+/t5XZs4fHaFa2bbYacyvHwzlf8/S0PQ61Gc1AAAACXZwQWcAAACZAAAASwA8NmxMAAAg+klEQVR42u1dCXhU1dmeBLFWwdrWHdr621rtY21t7aq/tf5txSpLyDaTCbuIICgKiFiQRQVBxYWEZGbuLNkDISzZQ1gSCJiEmJBAwhISIAlJyL6vM3Pn/845d793loRg8XmY5zpeJveee855v/1837kqh8NB07SDdvQODuwvqZn6aead8yK8NCZV0M3jxj1um2metDF9R15le8+Ag/nYVTT62Gpau3++dKcqiFKpjd5qg5eGujlfN+6hMSKk4FttnPB6bFFVKwAJKKoA0Lq23h+9EoX+Rg50w00sb2wsCUzoxKAK0BVcaAQcVb2Dtl+8lYB/tcCfvYPMNyfru3BQzDegpjbcuyCyqbNflVVae5MLv0uHVihpTV5azHuB1PascpXP1iwQu1LRCpx7c9a+Q4fa8MhbO1V3zouCMxFrMrjePG5Yw0cCJMYOGBLxKbJab4rZ79jBSFchxu6owOL2Fy/hL4Jz6cOuH51qhc+lPKLlGwcSDf/tHC2LeIxODg+eRCnZxBYX8PM9CzbL5pHitffo2ujI3zKLPCuhdfBtktdILFIpiiPpqnsu5sDQoDACmEwqfyP4NF7+BpWfHh1wAoeaXMbaUKz1hAS4VmSAjXIgQmv6+dKdL2xKn7RpPzn+9XHGxMVxQE83JHJuidKJgPFEtLhtHTxOsI/ufjXmgUVxf1ufPP3zA4stX78VU/h5Ssm2jLLP004ti8qfHZb9v+tSH1gUc9fcqO/NsCBceXuKur6CTm2+2t5LolgoGMl+q6Zsl/PijYmucq/4uI3HcLr8M2ouq7S6saPPbrc7xB8yZZJPU1dvUVVT6P7TExbFe03XfRsaS2Ns6+63O6AzpId2BsuXQ75rTGnhQQXudKsdh4el2rgkIh/DZkPfZKbYEzGI/D851L9ILx8/JwYzqMwyGkVoNcaWnn62e/xHNTn0u2GOgsbR6JAkC6S8g03j50bevzD2J0vi+XkT6P4RY4ni7Oac8w4F5Nx/MHPYL1zthJ7J+zGa6zBqqrm7T94BEZY3ssesMf5wXuTy6Lyd+VUnL7Vcbu7s6B2E/v/glWjWBBkFvkRYRh29wILDfHHcKUKOwdsqR734YjMyl4jncD0mV2PEWNolEsLr5dDrSECjePiEl9e2cAxAs8rrwUUxPJYeylvXMjbq6HmHMmyinwgXSn7nFOqahEKvAKVwhNadI6hVBp7RK1ohlkp8qXXyFE/QlRCf0gWoG4qPcPtEbkRqg9e08PMNHXLh9+DrsU74kho9LGlHTWu37tBZPXOUU9nnU4uqgf+sdhtnejBMjD8tnb23zoxwE1pyoxUoMkf89En50pmMpaREjf5JuQYS6zAXQQ/2r8FmxUAKf71W6NFZpHEV3JQAS4cYy3iC5TDEyfCxpNNP1iKxiRwP7jCMnWH58fzo0uo24ZUEzp4B6yNkWc0FTwCFAu/6UWD9kkPlGwZerMh0ElMD5/66wlJi2ZPWNNhlgsanG9CDfMK5b3QCHjManQF5qEF6hIfarNABlibQd6AetQl3+em9ffVMg9B/5HYT34wiC8hiWqScYIkY9J4FsYzj7o+76o88ezeu+XCxhA/CUs0ubQu6BScPv7nDaqOlli3t+P17exXYDuYI2vHTP7Qk7lXD0cT8i9UtXZxrcaW1J6W4+nXzcZTw4KtzyrJu+FLAamRafXXQ4CLT8eSiy9XNPRLJ1jtoK77csi2r7N8fZ46daRJTkkCEsniMgWYDDN+fZZn8yf7Q/WWnalsHbExTnX1Dx8/Vf7C35Nl1KWwsRY6EU77cVVANkw/2ChzRuZXwvTnpJBZvo45lIOXEXDJ09Q9xeLBkRv9x9V4mEkSEjJZfePsy8xQSzrRNTJk0doTsWGjbIo9UcGJ2GDJWFCg2Eji3ppba7VbO0SKdhHOJygfPqqGtB0gTa3p23mXizitQ//yHaZ19gwIHV2g94AfZ7Ofq2+9+NUa4HsXKYadYyu2Sps7+u+ZHjaa+FPClVIKh/vmGdfUOSToB4/zD6iRxHBnx8QOLYwsqmwSDl/aexnNK9C9ciZbneDlDDYsvVRjIHXmVxFLj5D/tzOOyE2JyTPk0i5FAQsGgYVKitqaeFs++KPYkHFH/wNC/NqYhAU56zi4YO5OxAq+BxxLNwPXAkidSgbkFWrNnYFDisQDb/W5VIi/rtUTiGU9XtwhnQXFO8ZQTqW2tbuq8baZZHtnyDEvLZymn4EnyAJaTD1xH2x229p6BcXMiJMNEHO9LrUsskgCgFAoTWfV/fj9JYgE440uFmFpnP3I6R9OO5fhSK9Z/MLxA6i9rk4dsIi8TxgCaA1nYwot9dVHHqgT42VlxSovuFRhQeCrs63d/g0hbKzJ9lbF8OUwojcdoTSAJaYXAo50WqQMbiwpN4IRzMNf5eCTxVdRG4Feh0S53cJkR4WtIa/B95korWpkQJOw480nkdNDV149S7EZPX6IOpZdUgzl+a7DZO9gEB0zTLcHmW4Ijnli5a2DQLpQwZAyFVY0qNZaNxCcLMoEpxI6QEcJWrCDBbgLTI/zg2WMVVweHMDsyWpP/3DVfpHhc8iWrL/0N8/RHxXPNwADavayuvfxK85mattq2riErozI5gUkkLeo2IR1swoB4KK9towV9w4MZAtXY2NEXmVMJhlVb9yCn8oXiZ3ZYNjKFWIvMGV/CzG/PKg87cC7swJntWWXhB8oXmb92EzQYLpZAq23d/XkVjXkVV/MqmvFJY/6FRnA6uTmieaDQMH76RhzvDKC8MSOIO9b0YGfNYa+42vnzpbvAoEdD9dU98FrsobIrDrtNyKOES1RqPbNa6ZmM9ZoedvTsVb4RmulYeNY5IDJvHx2yk8GF8Al/bHkigCGHHAwcwSqpAS5jRip+6JSt+8GtQpLDVzdGa1kRky8LodhBPHBYupCxP3w1GrUToGNWFQOQczL6PolsCFaR9udFpR34LDg0G8fwBE60r66ysVPe7D3z4yS6EJwHsXhHLZ+tbb9tRpTQGXevL6dsF/aZnNlo+72vxfG8y8rPfYWXZRapY7Elj+VLtGr7VWa5fEIWmY5i04YP/XgHGYsvNkvkAfz31Kq9rPZ1ESuIHcV4rFMsnQh14QnqcVVT1+9W7cFWEmeII7oGb0x+X1pJrWp6uNTf8AkvvtQoab6le/BHC2L44ItLLBkDTW2UkaAdjBpE+7LVUN3BM8KQM5Eua3d9wwbtKNXUMHBXxEIFeZO3kDAQvxaEJNAbkfn8ReyjkZhV0JeiDxj5cizdxIBGhKVdZnlL+ZWcw+2AnMigVxv+/kGq3JF6d0eBF3GoyTo2OfHVfZpaJn22g564OG5YdizwB2JEmVmIs/UNbPyIoYwQxHN2iY+0NqGIjzIG6gXuKfMpudyK2hHGwnBo7Ml390rsGpiY9buL8RgNbvgykFJ0akfRjh2SsyLv4AscIwInqFVkBDKhagr6N1+fKzf8QAtqQrK1ITlwBIccRd+hRwK+PLin4KJcwoMLz5uCnuhLrVHcV7vA9TZJQgohmacFpixzMbgfHOPevzBWQolwZUVDB2iTGdtyyBC4Y1nUCbmNGp51BjsCSCA7xXKxbM3rmnK3lGwf0I4nL7WoQ6Gjh3F3D8OkvxH5dfzxKhyBEyFMpuOr9NPMshe0GaB7OzrfhQKW8bqN/4X9/0NLE/g8UE+w1JicuGuRsqC5cVvGKfnFCEuWLx98PV7Zf1BwLu2SuAE5p7LPs14m5SGWLHdSo4ulQxhbR89gpcodcyKBvThpRrO97+gdRCvSRBcG6N6KypMNm9NONqFeoRXnx+F4eGn8CGSsRG1xfCkSYgxfSkFal1jI2T4g/eQ6gniijJEswk5oczFutP7gOYYWtfph6cvRt30yi2vFQRD+/O5XY/qtNmlshXb8dV0yYwEp8aXr+Iv8/KGlO3gAPMZSzpeMjA1ygyUt5EuEZbznhqB0FFjMGA6fY9ZqBHxJK9qxw1q0v6Z4rPzw1ZXVtMpHhfxc6LrGyPClwOIVxEXd54aRnybAOLkI8PXHkpGxajMWQgaQfjL5aXc4D0PKqXPNjkJF/5KWYmlm9YjhmnMqnWCZUVojwFIswf30e5F/Jv0si8ljHGR/A2P70CKaXWg+BjM1Ruv+YIIvuJL0W8KSFvHlPQtiZWRnO1HZ9L0ZFq6TY4OYc3BU4Bs6IPwnigAIsbzaLlc4LJbSiPd15EupxeyrK6pqkcua5dEFxMKGG5/dkCwn1a2ppwUj9CCDlMmltlx3LGmR7YPGG6CTr4Scr2+/hU3S59azXGVQqNlrpoYhvqSl0pjLK7iuMtYuWvNiM2kJqONmR6I4qkw8gneBZSxyqmDMvANHE4vAcaW1B0YFnjhZEUNRBdawZPMBKD4xQLhs9O3I2F3FzONwrKCurVuuDia+voOL5mC7hqx+G5nhaOV5MBSPpUyPPLgw7nr7JJgvS6qxiGMmFy9gmYn8TCi4yJmvfKTVbn/qP/v4YfgbzjW0iSJFeC6QBx3IFp0RV5oU5qsF0UsNxRc1fFu2j8QnAT3yWUqJYHmHIfHy2jac1GJkus0vX1PihCbh+qVJKGNpab6PQE1qr0vcx15a0zI3PPcVQ67/V4embN0/V3fkndhCc875xs4eElS3O0T+Ivgk9y6IFjb78b5iSdCZrMuDgff8h2kPLIq557VoOB5bnvDY8sS/rtn3zIZkn61ZC6jclXEnxs+NZKtWvj0s1/JY6kgqjISNyJALKpvU2w6DmX3fazEwZLgMhvDku7v/d13KlE8Pzgw78k503u9W7eMZDnjXJ7ywqlmYSEAanP55lmpyOFOxQ44A3ejH1hUTAJioHvmTOH82Mf8iMnw4StSaH1+xy0bbJfYq7WIlV/DRhuRwGSpod4VvkS85thg7w0KC5lwsk/3w/rHScNCQj5yt41ZDETZ++rhjlYrpqJmnaj/eV7I5qXRTUumW5JIFhqNu6tVd/G2M2jSM2Loy0tbq5h5vXJciEoz+hg8Tv5HECTx01zQh2WJF4gzLbW6w7Op1iyUttH0CRZeB1pCnBMtjXvJP9pl6wcq2RRWoDw7Ndsst8Glo60EySVYzxBf4ueZLy5EKTgAKHF5Xy9/CMXT0Wp9YuVtUbMTlNvob0oprFFNjnFU0EB3MYylcJ6GlTh7Pl2qzMO7D6Tk2tm5UxJIWuwi8viQmtNbkFUAFheZwTCnOMXBIqAFFItnu5ZQLsMQaceKS+K7+IUlOBTm3262cC1vT2gmm5YhlrPmd2AJxYpmb8AZ/Je1ILrqMTLtAhVJcIqxumxnxRfppWrrwYncCp4NIMG3IYT7bCBMprg2S1ipxNXtgayAsZaKPTZ8Rl1mxsXVuBonkZNZJpGnTRv8vDnBBA9qNoLITtQIyFi19i3mGpA4J0gGFeXhMLLO6pWvcHPPIa/bAmD5X3947aFNWk+IVQSRSbXRjR19eRSNKUvIJZ0xc8d4WImcxQPf8hymVjZ29g0OuVWZfvxWEzDcXr46fEyUy69VmbjVRmD0lxBI4iVPP3Ke5o+fOeRFyOgPNJBd0q+LyxclNRpQZq9UDDCCos89c6egd4NfkleTkoHUIqKeqqeuZDamMCyCUk9N178UXtPRIBIyIYS43dd8xZ8T5saTTWtMv3kr4y9pksNDgeaCHY3Mv7C28fORMQ3ZZHRwZp+pM2RXrEr6Z8lnmr1fsQQnXOPIuiVkLKgulGc/AN48sTQRLdVvGqZTiamgTBFF6aT3YxjCzc8KO/mF1EvQB51QKsshZK/+Xb+8C0iHHX9Ym/XVN0q9W7BZlfQZSj72zG4YAB3PlmhRW+EtlLDDrM2tTuAZxm8mMopKna5Ph+KMgLRirwF478ipzzzQcLq87eLouOrfiq/TTb0Ycf+6DDDDIcRqD8yCO2vjg67EvbErfnHRy3zfVMAMwD2kltRE5Zz/cUzIrNOfRZbuuwY4V1cHg7bpIPjzOZyF5+yofPZO3T1wrF5GOYLOs7pwSec1AAQEk9QZn38Dhp0epxoGe1RU5ixZpPb3eo41xhBWvsjxvkqnE11CQVB2y3oecGUp5CMITphYDZtUgacR9UbdnRdhGLu+bxG4IgTCeO1NMY3Ra+6GVVNVQ0gEI78V5BQwBaphztoJAMYwnoQmTwHmg3G9gxapJQZfE5URK0RZkOmqcwMmWjvAGp9ogrj9Rrv9iu0ExIQK1gQ0VUWRE14glNby/MsM2CucL94DylCE8LDRUYhogOGYzP62HmzsI9yOzyBIMOF1gEV2sNTElPhJad7Z/DifqsY70CmLq3dwDE8yHdnlqGzmWw1k8c5+W4uFWMFrPicnd9g3/vZ0HRJQt25pmBLvEXHNsXWnKRBtZipWH0q40lLTg5Br3CxtB0et/dx8mz/lBOxyKHyGWctHB7dQTFCGadO21ceRIy98Vtq66EdDVeshh1KjtEuYeSC3lUpC62lJIxIhcpvmwdkfRDnOrLo3RU+0yujsNihc0pEXRiryhEa6oiBoZocrwiOS1ZmLBYpPS5KJWWdItImSIIcqbpsNTfhS/J5zCxRbeYxvBhjjXY6cltVHkQ2uM0t3ohMnQojVa87Xqfnd0J9gKDdcwM26JW4lBlmm0uKPgL6JkGWp4AkTrsaGB6wJumI1fKGkBL659l0HIx2OZqnqNTrCU7YTpR4alNGqjNk5YFB+SWT5+rjvJjuMskzamr0Nry9TExXGfp5X9+p1Eti7aqLDThOREtj+hq8FojH9+P2njvhJRcHVUNp+Rd0O+TQbvRFLSXRaZrQyoSR+nhaSXKfOA2jhudmRI5mlUeyQvTxaejMJ+eMzmhKhPPluzHA7H48t3s6lTlHjRX7C5g68u5mglCor66Z/fmM7niPCMTjY/xN+SE7Xx2fWpC83HvHE0mN0JgVLJ3s7Axi6Mq+NPOBzWx5bvdpJZQ/EadATQKtKZomJmf//tyj1vR3+NFtQwz21JRsnTY7QS+mAGBbTuoB3/2XECJu2lLWnz9UeQPiJRNmbTCvH8XJO+VBvGzYm4Y1aEetth6NMvl+8iFASdu3Ne1Di0yk8JlLZx/NzI782wxBxDC58qX0qU6KA2wF3j56C7bsPbKEC/bwu2jJ8XddfcqO/PQiaPl7/uROXVpvbeH7wSeftsC1cJC82OFz4LvwIAfoG+rUkoHLDZH12WKNmO/NZZ5tvnRULLt8xgSidvm2mGZ90x28LvSa4xjp1hgXZgLKjoWrAqBy2Th+KoloHMBlDY+FfQ7yQWxsUBxpEW5qCWdYfODlntj6/cDQ9Cl7GlIzDA22dHcIQIo/v+rEjmr2oU/GvtHThzpRVNIBo4qvJEc4JjanB++2yLG1Xqxp6crtucdLKhradnYLCv38pgqTHesyC+4EJjZ99gU3t3zNEKhugCTSnF1e09A92Dg31DVpvNBlT5xMrdV9t7X9qC+BJGW1jVDHf1Dg4kFFxU+YQ/+d6e0pqWngFrd//Qufr2lfH5Kh/91+evOhz25u6+ioYOVaB+wuux8As029rVl1Fyhaxsw/fO4xeudvXAjfCswSHbo8t28navxvj4il1FVS3wV+jM+t3F3mrDCxszS2pauvoG69v7tiSXoGBykOlni+Pz8UDg98uNXU+t2UsW6TannIZRdw9Y27r7YYA4IZR6cGHc0bPQkyHoTEZpzZgZyCQcq0Ur9i2dvfCss3VtcHvY/nKaRsXx1c09970W8158IXpJgb8h8khFyeVWrOAB18iKhvZNSaXwrI7eQf8vDkB/Gjv6rHZbc9cAdAlaTi+pRid+eq9Ave7gmaJLzSPdrwAbYz5ofc4BAv25D9I/2H2SwdJPDyOEwS+2HCMVbq8YcuFHsuHaa6bc5zakoDJYLGPx+rsDeBrY4uyVFpi12WHZkz/ZP/nTdBg2/OnC1c5/f5z59DokiiNyzqumhgFyMKon3tmL9oMPomBIABXMyLrEIhjqzrxLMM45YajO+ZOU0kmb9kflVPRbaYYvCZy+YefrOrv7rDBHL23OePr9JJj3+vYBoKoFVC7OyXCANIP53Z6FKilnbM95cXPm+YYOAA9aQHLPYd9XePmFj9I+2otG7fflIej/rrwqq41es6NwbUKR3W5PLqpRBejgXjxF5S9uykCQaIxhB84Aeb2wKf3RZSDDzGR/CvgdFA2c3Ik2uiPVuI5nNySDVICTefocr2kIy/P17UD9D7+Z4B1sKqtpBXoiWJJC65HuV4DtncT8KqCvH8+PhmEDAAjLt3eB9AARDyoN7Qnwzy8qG7tOXmrx9tXXt3bnnm9AcsBnuym7QozlwXtejQIKgPFDz0hV3jNrUaLsrO2H0T9fCoFzS/Y51VRdXkVjXUvXLcER3lgmA9HA7KsmfaGaHAp0erG5+1ZtxO6CSzS0PzUM2nkntmDIZkVYIm/YBHeBICX502idAa88YHgwJP5IMgNrZp+ph+4VVjU2dvaopoSQjRx7B4fuXRD99HpUVfjchjSgNiApEOA4b90IhAjixOuFr6Anh07V1bX1gvTekVeJ3tkzLYxdFTABXwKW//NGPFk52ZpaCq2h7FlcBrrQeAy6DcYanMOk3TrLxGHZ3NEHUopIeLi+rKadYAkjSiq+FiyxgjlUVg/EgvamQbbPQeg0YPnHNSjVpbdvCMRga9cASMhTIDrQnrz92WV1QFDweHPOBQ5LGmMJ0qalpx+InQ1BmKYg4rBP//wA6t/kUBZLxJdommYiwXCLBiXTwiPgQfA4kGPAx2NnmjKKLze09ammoUSQlXEngF0YGYsn4lcrduFUtgNAN0hjBeonfZwB9PfbVchwA4UH0g8oBqay+GIzzJeXD1q4xlja7n0tDoQQwnJ9Olz8m5X7oHGMpR54EcAmo4aeXG7qBv2358QlJEKnhqFNurA5A1hCO2iLKYSlcWsqKuhEWPobCiqbEA29GAqjAFaDX0CpEyy9p4VDO6er24gmBlIur20bJb4MMnkHGlNP1gCWP341ErCc9tkBmA6QsU+tQvWhwA0TFsdNeCMeSP7+hbFg74AEyymv9w62SLBESTpfHYY5AhbfC1iyy5z/tymD4RWCJc3I2OPnGq60945F+0MbgDKALWJzLwC7TFwSD8cDi2JAspFcIcxPhnfjC3ks8RLgBFyKBdKPyf9TG8Epgl/+9kEKwnJuZHVzb35FPdhZxZdb0HxhmrAcqRBi+TfgS7XhN+/uYbE0wkn81xUgYH6yJB48tIkLowAqXBOPtsVkzGyMZQ/BEsaF+PI0w5caw4bEYtpmv2NOBPwyl8qFizksvTgscTsgkPIvtMCUglARYBk5cr5cHo3yfaZ8knHX/AhQMFjGJsDjwU47fqb+F2/vBEkCkwg8p/LbDgIWevPrFXtARSfmX5TI2DHBFBDyubq2x5YnPPzmDpgOUpgRc+wC3A5GGpyj/bWmMfoS/grGMwys8FJTR08/zClKN12xA72xKpB6fydK4/v7B6lwL8grjOUuPlA8XWezO6AdoLOfvRkP1wBN2Gj7gVNXfvrGDuRc0Q6w6eAyMCh4LHMvAJZw8XMfIhn794/SvDGWQ7ZBlLeuNkCDwI6/XbX3oaUocfeRtxKAGlbF5YPgAScSuoeKfAFLrC9//97eO+ZEclgCrYP4fWkz0lOr44vh+w//2YMNVMDVjlyRqWEwezA/4MwQAz7uOKIt8J7vXhAFPQcs7xy5jAUXKlAPYpOk25B0XsAP+kdqQmAGB4fQj8ge89P/YF5MVz/YrzSYqSR9y8vf8KfVyTip9TA09cfViKGtVpTFBAYhcJX/V4fILnSkHWQx+mxfEnEcznv6bSAJyQYyJBUICAg+RVVNIIVAhYP2xfcOkfwmmFwca2R8dqLdQY/CXaiYN4h6C+9RTbbr++ZiC3IzcFUatIP0bpApOrcCOnbfwp3guRNCAWCefBdtX7NhTxHm0USSxdMPRjptL61GiepAuGTrEXjQ1c4+uCxoG8qRHBi0A1fduzCGFOci1YPdEiAymJmufitxVwhfotxXXx0xxIBckLkbSIGzgKaKtvUNoRkDbaocD+EOQSGjk3imn/7Zj5JnhR/995aM+xdGk70kvALMP5wXDUiAUfqPjWlEjhNTZdpnmdqQHJgORJVBJuj9y5szmE2GwGmbGwk8CiIXqxNEKz99IxbMH7AAn1qVxAS9fHXPrk+dFZrzrw+T0YwHUqA7QVvPDD0EtuJ9i2IZh8xPDwYwCNJJGzOBctGuKcI9kPwNP12SoA096L81cwLZKcpX95MlsTNDspGkBSWEq4CfWr0bpZlhPwQ4+58fpYIwBM9y8pbMO+agiQMW+cfGDLiRS3KY/un+4NAjL25ORyUfJILoq5u8OQtG8ac1+0jH4AQ69vKWTNAUIBjASGbet6FGuzhDH8bNtHCeNzArSgVC7YSBXocbn16fQtxWELzQpSlb94PeASUtK+R2y5dak3gTd6W3f6BOcD8a2Be+GEWHmpL+ImlKEiqTx8ZIbEX4XMmN7ARxS77i8LS4ZVHYxaiwesP9rthneW+dDYFrSvC7YEqNfDWORiluxx5Tt+4Hc/3LtFPgF4EPWl7bgWwIYShUEoiXRnK1w1m11zKrmNwF3Oqr7A1FFmeJM9JHuN5mdjjheOUX5XDFCwqxOmcpOZRo5cdt4dW17S/P7YsLzL0zv+poeT3oo8gj57C3anAVmxU+SXlC5VmQwmFoPVi+5ja+0Tp7F4fBTUBc6+RcMfFHQ7mfYtcLZMjmJBdYcFjYLF90k+RXuIHT3XbzbOq2RdYIcqiY5C4N5SZPAwxU/knyFCbhMptiMo5WFAJ1xl7S1XaNu9CiRrIdlnJyl0geKNMWxa8aal2k0Am30Ra+4sj9Ygu7lmdx3qDF7Zx4aSyuMkXcLQkwK5K+Xxxkg7+mkazo8nsdGYf14jHFjl5jCpawMIGfDrXbtyZTSplXRjzFitdbPMHYDd+zGSQKr8sTQUC5zFHlD7SqCI6LyoMXbA1vljUGD1+757JZSjm3SD7gkc2pS6pl89AsHmToePziLa1nmXYKKeOyLBm284xNEEihLR8HrUPIZZRnEmuHsYDOWJt8notFdDuvfvgb3bxPwqW+5CgAKy3KhaHBroA6a1+yNqlsBPD576IZdCWxef2nNkv1giQPW+tBQqXgrcGixEfyvgaN8YGF0eCxqMARbmjrATdfpO1uHjf26/jY/RyYLI6Tl1pQaRupHgQ4H1mWwG8qeHO+buSDVDrgArqJi+PKa9tIXEzFVT0OWe0HT9cFh2ajGIr65iuHb+jjznkRL2/J3HPiUieqFSSbZtr/H9Ub0161rtomAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTAzLTI5VDEwOjM2OjEwKzAyOjAwkWix2gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wMy0yOVQxMDozNjoxMCswMjowMOA1CWYAAAAUdEVYdGRjOmZvcm1hdABpbWFnZS9qcGVn22DkxQAAACB0RVh0aWxsdXN0cmF0b3I6U3RhcnR1cFByb2ZpbGUAUHJpbnRNbINqAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2FtcGxpbmctZmFjdG9yADF4MSwxeDEsMXgx6ZX8cAAAACN0RVh0cGRmOlByb2R1Y2VyAEFkb2JlIFBERiBsaWJyYXJ5IDkuMDDiS+ceAAAAEXRFWHRyZGY6QWx0AAogICAgCiAgICuew8EAAAAWdEVYdHJkZjpCYWcACiAgICAKICAgIAogICD4Xmb7AAAAEXRFWHRzdERpbTpoADE5LjQ2NjY4NL2H9bkAAAAWdEVYdHN0RGltOnVuaXQATWlsbGltZXRlcnPv0HhyAAAAEXRFWHRzdERpbTp3ADM5Ljk5OTk3MEN75oAAAAA5dEVYdHN0UmVmOmRvY3VtZW50SUQAeG1wLmRpZDowODgwMTE3NDA3MjA2ODExQjExQkEyRkVENEM0MEFBMf/AfAoAAAA6dEVYdHN0UmVmOmluc3RhbmNlSUQAdXVpZDo1Y2JlZDNjYi00NTBjLTA3NDctODY2Yy03ZTJhYWZjY2M3YmGQqoQXAAAAPnRFWHRzdFJlZjpvcmlnaW5hbERvY3VtZW50SUQAdXVpZDo1RDIwODkyNDkzQkZEQjExOTE0QTg1OTBEMzE1MDhDOB+exmgAAAAedEVYdHN0UmVmOnJlbmRpdGlvbkNsYXNzAHByb29mOnBkZi6gIiYAAAAodEVYdHhtcDpDcmVhdGVEYXRlADIwMTAtMTItMDFUMTQ6MjI6MDMrMDE6MDCEgKZYAAAAJXRFWHR4bXA6Q3JlYXRvclRvb2wAQWRvYmUgSWxsdXN0cmF0b3IgQ1M0Aa/QiwAAACp0RVh0eG1wOk1ldGFkYXRhRGF0ZQAyMDEwLTEyLTAxVDE0OjIyOjAzKzAxOjAwDNrJ3wAAACN0RVh0eG1wOk1vZGlmeURhdGUAMjAxMC0xMi0wMVQxMzoyMjowOFqz99SbAAAAEXRFWHR4bXBNTTpEb2N1bWVudElEAOocGPAAAAA5dEVYdHhtcE1NOkluc3RhbmNlSUQAeG1wLmlpZDpCRTczQkZBODA1MjE2ODExQjExQkEyRkVENEM0MEFBMcWJYwcAAAA+dEVYdHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRAB1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM49OjDJgAAAB50RVh0eG1wTU06UmVuZGl0aW9uQ2xhc3MAcHJvb2Y6cGRmhKbfiQAAACB0RVh0eG1wVFBnOkhhc1Zpc2libGVPdmVycHJpbnQARmFsc2V5GcblAAAAI3RFWHR4bXBUUGc6SGFzVmlzaWJsZVRyYW5zcGFyZW5jeQBGYWxzZTpcPYIAAAAPdEVYdHhtcFRQZzpOUGFnZXMAMcmB27IAAAAASUVORK5CYII=</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>193.190.0.0/15</mdui:IPHint>
+        <mdui:IPHint>2001:6a8::/32</mdui:IPHint>
+        <mdui:DomainHint>belnet.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
+VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
+NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
+ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
+ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
+ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
+gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
+Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
+z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
+03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
+2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
+aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
+BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
+cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
+DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
+BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
+gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
+Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
++BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
+K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">belnet.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIExzCCA6+gAwIBAgIRAMNmOaeNUJe5LtzIpBM//sEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjAxMzEwMDAwMDBaFw0xNTAxMzAyMzU5NTlaMIGeMQswCQYD
+VQQGEwJCRTESMBAGA1UECBMJQnJ1eGVsbGVzMRIwEAYDVQQHEwlCcnV4ZWxsZXMx
+NzA1BgNVBAoMLkxlIHLDqXNlYXUgdMOpbMOpbWF0aXF1ZSBiZWxnZSBkZSBsYSBy
+ZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMRswGQYDVQQDExJpZHBzdGFmZi5i
+ZWxuZXQuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeMjJ+MakW
+ESz80oYi0FOG3gW6iiuyD5BSxQ8Gr9CEg26YxVp5a/eSofaWQm/nTo1WMt+oUYme
+gFhquFXyFofQ9JiQesqryf7imMsBloQ6wvvobpKYsbLLegYpiFoB4WF1jwwbDUDp
+Dt6fV/taiLIv9DWpPQzaQ4FybdMYvERGzYLryUB8BB5q2c7DjyHCor5hqpw2Mf7J
+z6H6WrQYkppE44+pSF/9AUiV5qPv9JJUmaqzF3f3eGU4SHjI0i6rZosMw28kp2vs
+03SFAnrhVjReHRSAy5R+XDGi6fEyO6hV68cncLoKRuiv2aYbc6ZuGJlAzioMPDRD
+2Eo7FGUWfYRTAgMBAAGjggFlMIIBYTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUl14XH6BEPRYstv5He0vPLsM/UmAwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
+aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
+BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
+cmVuYS5vcmcwHQYDVR0RBBYwFIISaWRwc3RhZmYuYmVsbmV0LmJlMA0GCSqGSIb3
+DQEBBQUAA4IBAQBYZbu3HknWMW2n+JmZBBXiLEOx0DdBWESX1tfG4kvT6b+lXD1I
+BLuOUTWS544wsMyqDD/I1a9mrAZAuoVAYvEVXlNRexkvZC++AzdoFsOuow4dxQg2
+gW87Z2oDHQiTswTPzLUeQBAo9kAc8IcTEVgy7921y7/xVgvwzMNG+jMLWW2hSDo2
+Prwn+VbHSG4eYz4GPrm/MX3WkROUqSbuGNgXIx6Inqr2psLxstXWjSDM55Qt+OsB
++BIxlm2pnEhk5WaZCjaRrBrdKjyC4TUVNDoYHbdwiu5ZAqnpWkYTT13qhCRAG+fl
+K6fSDEGm6Kz/5tRvh3u1WklUCJRx0A6nMD/b
+                  </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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">Belnet</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Belnet staff</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.belnet.be/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Belnet Federation Technical Staff</GivenName>
+    <SurName>Belnet Federation</SurName>
+    <EmailAddress>mailto:federation@belnet.be</EmailAddress>
+    <TelephoneNumber>+32-2-7903333</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
new file mode 100644
index 00000000..e1f69a35
--- /dev/null
+++ b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
@@ -0,0 +1,118 @@
+<?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://ifs00sv056.ifsul.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">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsul.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsul.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
+0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
+2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.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>
+      
+MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxNDAyBgNVBAoTK0lGU3VsIC0g
+SW5zdGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRU
+SUMgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29t
+dW5pY2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYD
+VQQHEwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMB4XDTEzMDkx
+MDE0MDUxOFoXDTE2MDkwOTE0MDUxOFowgfoxNDAyBgNVBAoTK0lGU3VsIC0gSW5z
+dGl0dXRvIEZlZGVyYWwgU3VsLXJpby1ncmFuZGVuc2UxQzBBBgNVBAsTOkRUSUMg
+LSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgQ29tdW5p
+Y2FjYW8xIDAeBgkqhkiG9w0BCQEWEWR0aWNAaWZzdWwuZWR1LmJyMRAwDgYDVQQH
+EwdQZWxvdGFzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF2lmczAwc3YwNTYuaWZzdWwuZWR1LmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuz4oD/NvC0Hwk0WhnCSYP29C98DOVwJ8sjOT
+1tfcOSkYq2DfXvI9macZLWi6PY8moeOGRlUCquo+w3Y1PJpwj0Hck0+HNN3JchyA
+iKr5LqnS/Ukx5M/CSvrwaeu7uA2Mpqv5PtfnUaU4ytDGBtWX/w1TgxbOTLFQ47UN
+69+359uqqHTvUFiRSPYGE7xGrpu6lq5A5Q/E6mkCMtypRAHH9Ld6fFH7AAWiExJH
+SGJq5rRoml2GTzm786NeM4rc4hIBkE9GuUyTtix6VJumm9PkF3HctGQZRYT/Iwi+
+PyISeGuDy2JWQy+VYgLBuyGsXo3O9LVMVe/sTUPr+2gU52AD1QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQB1yTZ5bnXiK5+4mMT6NSQvkxnBn6KAu5hau+MREI3WM3CL
++3udcHBNFkxSEL1BVJjfrg40IzSic5rVQ8pK9EWyhey4AcD9BBkrdem0P7Z+0+PJ
+pV6SV+n0MoAGf7VJxxXaX4JcJmrwQOXhj0v+YhOoBmmm3ccCrmzWvWpKPO/NgUYR
+mXkx/UZzoIc8si4G4f0tdrteQMtpq3p31STZAX7kIr7Ih2GwQXWRqvyRmd0CtAwE
+0YO4sFwtY/JBMQIwBDQNYFv6H/+6wo24inxILDSj/jHX60t/tSKPBRdkN0JXnv1A
+2EfD1BzA7Hv6BsAWRmUYnsxjtSsQc4LJizwpTTvp
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.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">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Maicon Anca dos Santos</SurName>
+    <EmailAddress>dtic@ifsul.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imogen.surfnet.nl.xml b/swamid-interfederations-2.0/imogen.surfnet.nl.xml
new file mode 100644
index 00000000..72e641ca
--- /dev/null
+++ b/swamid-interfederations-2.0/imogen.surfnet.nl.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-09-04T14:01:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SURFconext decryption proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Proxy which decrypts assertions and forwards them to SURFconext</mdui:Description>
+        <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Bas</md:GivenName>
+    <md:SurName>Zoetekouw</md:SurName>
+    <md:EmailAddress>bas.zoetekouw@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
new file mode 100644
index 00000000..dc6abb96
--- /dev/null
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows users to access the digital repositories created for the INDICATE
+                        project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
+                        Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
+                        e-Infrastructure providers and the general public.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
+                        europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
+                        i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
+                        culturali, i fornitori di e-Infrastrutture ed al pubblico.
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
+                    project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
+                    Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
+                    e-Infrastructure providers and the general public.
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">INDICATE e-Culture Science Gateway provided by COMETA</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">INDICATE e-Culture Science Gateway erogato da COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net.xml
new file mode 100644
index 00000000..7ac7acc4
--- /dev/null
+++ b/swamid-interfederations-2.0/issues.shibboleth.net.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://issues.shibboleth.net/shibboleth">
+  <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"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://issues.shibboleth.net/jira/Shibboleth.sso/EDS"/>
+      <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://issues.shibboleth.net/jira/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/EDS" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net Issue Tracking</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+					The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
+					Unauthenticated users may view submitted issues.  Authenticated users may submit new
+					issues and comment on existing ones.
+				</mdui:Description>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRjCCAi6gAwIBAgIJAPjZ6g1hwfvPMA0GCSqGSIb3DQEBBQUAMFExEzARBgoJ
+						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMR4wHAYD
+						VQQDExVpc3N1ZXMuc2hpYmJvbGV0aC5uZXQwHhcNMTMxMTI1MTQ1ODA4WhcNMzcw
+						MzA0MTQ1ODA4WjBRMRMwEQYKCZImiZPyLGQBGRYDbmV0MRowGAYKCZImiZPyLGQB
+						GRYKc2hpYmJvbGV0aDEeMBwGA1UEAxMVaXNzdWVzLnNoaWJib2xldGgubmV0MIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtb4jIloWGvHJsSeq0PMjkWDA
+						+hseZ6/6/cEJKPk245f6hktC2k3z0AqJL8Kw9OudOjDx2op2jKm45TuIA46ti6VP
+						f4stLIi7mO1B4A6jTWThCwU0DjMCwBXLhANdBQloyUYJU/usN8RBXlPnWZAV1dVb
+						ygb7GUorkMON+wnFd7nhBePmQdJfbsqvKN8MykWfQ56chS+0lCYhyT7qql2bskJ4
+						y621WSo47php2NyyU1KNcaFBLoao+UTH7KZ9qHOWJyGJGuWKwgZmCiVd0LQhWywP
+						3M/JxZvpTr2Bs/J5d8BzZGSFUaHrVcPzIX+5c3sdK4d1wXUur1XE++bh9F9TjwID
+						AQABoyEwHzAdBgNVHQ4EFgQUHtV8GWr64AIUV634b9YBlMEpHOwwDQYJKoZIhvcN
+						AQEFBQADggEBAI0BSqXoyw5bUVQJKNCnxB3hUwHIOXeoS77jqgv2lesyTqz5U4NV
+						v4Cdz7icwYzt+c6ZSZqem4pqmi3/6COZnf/+l29J/XwWkva32P6tfoO4af3qywF+
+						TvuZiRMXdt1KE7GTlYOSxOsnxaRmXVc6MWfxPT6oTOt5z15aTdfEzK+wVfeUkIf1
+						1soEmMHgjDaa/HQdGgXGq/fStDc0Mcm2W7y50+aNwqIMNiQQiwQYSUgpBatSfKy1
+						umh6DHEyznDZAAHBtatzvQu1YAJHUg6AeimuhminaM5tyBCW6Y6YMywFYSP+VqPU
+						PxCBrPWcCAwOw80Ey/FLVlAdW1FuwUmMejA=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SLO/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://issues.shibboleth.net/jira/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Shibboleth.net Issue Tracking</ServiceName>
+      <ServiceDescription xml:lang="en">
+				The issue (improvements, bugs, tasks) tracking system used by the Shibboleth project.
+				Unauthenticated users may view submitted issues.  Authenticated users may submit new
+				issues and comment on existing ones.
+			</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"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Issue Tracking</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Shibboleth.Net Technical Support</GivenName>
+    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott</GivenName>
+    <SurName>Cantor</SurName>
+    <EmailAddress>mailto:cantor.2@osu.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ian</GivenName>
+    <SurName>Young</SurName>
+    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml b/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml
new file mode 100644
index 00000000..ffaa5a2b
--- /dev/null
+++ b/swamid-interfederations-2.0/itacare.bahiana.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://itacare.bahiana.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">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
+        <mdui:Description xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.bahiana.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.bahiana.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxMzAxBgNVBAoTKkVzY29sYSBC
+YWhpYW5hIGRlIE1lZGljaW5hIGUgU2F1ZGUgUHVibGljYTEMMAoGA1UECxMDQ1BE
+MSEwHwYJKoZIhvcNAQkBFhJudGlAYmFoaWFuYS5lZHUuYnIxETAPBgNVBAcTCFNh
+bHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2l0
+YWNhcmUwHhcNMTExMDA2MTY0NjU2WhcNMTQxMDA1MTY0NjU2WjCBqDEzMDEGA1UE
+ChMqRXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYXVkZSBQdWJsaWNhMQww
+CgYDVQQLEwNDUEQxITAfBgkqhkiG9w0BCQEWEm50aUBiYWhpYW5hLmVkdS5icjER
+MA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEQ
+MA4GA1UEAxMHaXRhY2FyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AK36i3sMlMwST5eW2ecBJJBkUz7Yu+MGyp2gDy4M4S7Tw7aiAo4BFYrbpN2UmhIt
+0vc+l1Ci0t9szr9PlNmg9fiHn6hqxDhMgWxD0Ce/oK+GYmdd6h64zVieWvW+1FTU
+w/uq9B1g9Uj81vpVsxGkM7FeFsgVKNpeW+yJNoT1hp/lEUky3bgl9z2/VDk5sBop
+EzfroSosr4WDFZFVSNQFfG8kdJF426c2jrLNDIJXSwqmS/DQP8heF1CxqFCm+A5x
++4tpY4At4p2stqDncERdVGISPpWGlqtG4Mbvmgz0W0Hj2f6jhJehYP6eiPZgjeW6
+EmpUdXNqWgFl40BSG9cs6KECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAE5n+Yf8x
+SMAk6Sj2la08iXsgUUTPvoWZub8ajJwoTdKxBQfuBt+HdGCMsGhjOgHFhtqHGIc4
+mhLzKeqBs3dpafCKAkhJrMlQeTuUfZRu4YhsC1+ZmYu6BT2/W08TnJrgZ82KwakQ
+f7LN7rf1E6WLMaoA7E/cOVthvrdhZh9kU42mRSZykKqT+x9hbEhqczoBzKITpBjX
+L1w1kIsitIT95av4pdJf9X0zQVpguSCYcR6yTb2qKwlLlwiWXDKqO4nw7rymGoDD
+95ABrbcH/Qx3S7t1vwXXA5s8W2J58dQwwq7B9LnSxqXjvczXv6oPwUxRtl3hxKTK
+f11XT7vSPYxSFQ==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.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>
+      
+MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxMzAxBgNVBAoTKkVzY29sYSBC
+YWhpYW5hIGRlIE1lZGljaW5hIGUgU2F1ZGUgUHVibGljYTEMMAoGA1UECxMDQ1BE
+MSEwHwYJKoZIhvcNAQkBFhJudGlAYmFoaWFuYS5lZHUuYnIxETAPBgNVBAcTCFNh
+bHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2l0
+YWNhcmUwHhcNMTExMDA2MTY0NjU2WhcNMTQxMDA1MTY0NjU2WjCBqDEzMDEGA1UE
+ChMqRXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYXVkZSBQdWJsaWNhMQww
+CgYDVQQLEwNDUEQxITAfBgkqhkiG9w0BCQEWEm50aUBiYWhpYW5hLmVkdS5icjER
+MA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEQ
+MA4GA1UEAxMHaXRhY2FyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AK36i3sMlMwST5eW2ecBJJBkUz7Yu+MGyp2gDy4M4S7Tw7aiAo4BFYrbpN2UmhIt
+0vc+l1Ci0t9szr9PlNmg9fiHn6hqxDhMgWxD0Ce/oK+GYmdd6h64zVieWvW+1FTU
+w/uq9B1g9Uj81vpVsxGkM7FeFsgVKNpeW+yJNoT1hp/lEUky3bgl9z2/VDk5sBop
+EzfroSosr4WDFZFVSNQFfG8kdJF426c2jrLNDIJXSwqmS/DQP8heF1CxqFCm+A5x
++4tpY4At4p2stqDncERdVGISPpWGlqtG4Mbvmgz0W0Hj2f6jhJehYP6eiPZgjeW6
+EmpUdXNqWgFl40BSG9cs6KECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAE5n+Yf8x
+SMAk6Sj2la08iXsgUUTPvoWZub8ajJwoTdKxBQfuBt+HdGCMsGhjOgHFhtqHGIc4
+mhLzKeqBs3dpafCKAkhJrMlQeTuUfZRu4YhsC1+ZmYu6BT2/W08TnJrgZ82KwakQ
+f7LN7rf1E6WLMaoA7E/cOVthvrdhZh9kU42mRSZykKqT+x9hbEhqczoBzKITpBjX
+L1w1kIsitIT95av4pdJf9X0zQVpguSCYcR6yTb2qKwlLlwiWXDKqO4nw7rymGoDD
+95ABrbcH/Qx3S7t1vwXXA5s8W2J58dQwwq7B9LnSxqXjvczXv6oPwUxRtl3hxKTK
+f11XT7vSPYxSFQ==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.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">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
+    <OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Claudio Santos</SurName>
+    <EmailAddress>nti-claudiosantos@bahiana.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz.xml b/swamid-interfederations-2.0/katalog.svkos.cz.xml
new file mode 100644
index 00000000..10a4f5fb
--- /dev/null
+++ b/swamid-interfederations-2.0/katalog.svkos.cz.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://katalog.svkos.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">svkos.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Moravian-Silesian Research Library in Ostrava</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Moravskoslezské vědecké knihovny v Ostravě</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.svkos.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.svkos.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://katalog.svkos.cz/logo/logo_40.png</mdui:Logo>
+        <mdui:Logo height="90" width="91">https://katalog.svkos.cz/logo/logo_90.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://katalog.svkos.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.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">svkos.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUMysVZyotzMFN08smrMEjxr7cBg4wDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQa2F0YWxvZy5zdmtvcy5jejAeFw0xMzExMTEyMDIxMjJa
+Fw0zMzExMTEyMDIxMjJaMBsxGTAXBgNVBAMTEGthdGFsb2cuc3Zrb3MuY3owggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMXDtGvbcdogNvhJbrKZmDxFqb
+9VJ33XYnH+mBPdndP5kMDcE70SZqBpJQlP4JP+0GvETydNlHnK/t7TUE8SyRV+5y
+dLMeuFnAvP4So2OGfJfcivVizSvNSKuiYWBO2c7z90E3e0qBET0/gBSZ/lMvNSu5
+GS7Xe3+j35NGUiwGIzRglMKOAPxiA+szn0wIBsG7JhMdHuZMUASeVJewAxlPVv1p
+C7BrtRYVPmHm8xfqoTFg9RJz8nWDfugKLOPeVfdB17UwQICMYLM6pCvCmDGZ3SFz
+k83oy1GqWnfsXasaEWAL9VpQI5keYO34kgjRadlrSCjaMCSwPEgII6Z7J88HAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGthdGFsb2cuc3Zrb3MuY3qGJ2h0dHBzOi8va2F0
+YWxvZy5zdmtvcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS5NR0hEzdvRO
+kCB+T+bV6A3WQG8wDQYJKoZIhvcNAQEFBQADggEBAHVlLp4Vdb1zrlGQVO0AZBoz
+pPpRx2+MW9nasMPsd8ybYW/mbvAQU1c1MaUCK+rRk3Tu+Jj08A6YJOY5x/yLXxjh
+Us6l6JqIDYn6M/44vMf0fH+DkA40zfnpI8fv07O5Oc8EV1MsBdQm6zBh19MmDxY8
+diuVwTi1E9kR6Q3RIzhH1TERBDOpIfsUGVv5IHywYlUYsxYfOy6A0FjEtenMpfsI
+4NMjUoYVfnC0z5aWU7Vdu5LJIfkNj4HCuxLZur7NBvX3UTEuegzZRewy5edw+/hp
+K1WmgwfZhpsu54HYP1WZcpvCC4nCiZ9b1wiwdAixsl/orsvhTGeJVLtV1MbEaHY=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.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="cs">Moravskoslezská vědecká knihovna v Ostravě</OrganizationName>
+    <OrganizationName xml:lang="en">Moravian-Silesian Research Library in Ostrava</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.svkos.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.svkos.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Magda</GivenName>
+    <SurName>Zavilová</SurName>
+    <EmailAddress>zavilova@svkos.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keybucket.app.nordu.net.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net.xml
new file mode 100644
index 00000000..f11b9f47
--- /dev/null
+++ b/swamid-interfederations-2.0/keybucket.app.nordu.net.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://keybucket.app.nordu.net/saml2/sp/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEujCCA6KgAwIBAgIQLINqZJFs8l1wYd2J2IBMTjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDIyOTAwMDAwMFoXDTE1MDIyODIzNTk1OVowgZUxCzAJBgNV
+BAYTAkRLMQowCAYDVQQREwEuMQowCAYDVQQIEwEuMQswCQYDVQQHEwIuLjEZMBcG
+A1UECRMQREsgMjk3MCBIb3JzaG9sbTEVMBMGA1UECRMMQWdlcm4gQWxsZSAzMRUw
+EwYDVQQKEwxOT1JEVW5ldCBBL1MxGDAWBgNVBAMUDyouYXBwLm5vcmR1Lm5ldDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkBbj0ZJsjuirO6tN9rbRhE
+5PfQKfjrwMf5lp1a05DHlJcxsv2JZGPszkOA260D8gouWfjk3DJQIIJJgELfn5yP
+L4zwKArBDpsttTXW+DFmhfECbkemWV571ErDHMVC9JUD39uLhE1bAoYFxAeJGr14
+mg/N5YdnsuSTGOfVfC+XuhA3CgylcGBIWoXHPbPlUJk3VWVeNnYjO+nLlKPjhSSq
+mRVhmVhEwREiRPgbKyMEEoFpdmSzuNWcBMtVKt4FTLa0cjx3/rIn77imztcXRDSN
+T6GwXaG5pjy+7E602epC4t5hbj6pxzrC7mpyIQXdYjKboPgaKQ+E7bv+OqJNG3sC
+AwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0G
+A1UdDgQWBBT0F6Szj83YxTlMGIIIf3I9jdTedjAOBgNVHQ8BAf8EBAMCBaAwDAYD
+VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0g
+BBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3Js
+LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8w
+NQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAa
+BgNVHREEEzARgg8qLmFwcC5ub3JkdS5uZXQwDQYJKoZIhvcNAQEFBQADggEBADMQ
+bc0dPVC1SlyOxDf90hN9sDKw92YdVtsUNFfs9MYivZK7KI5+qEQStpAvXkrBUNfd
+gM9wqL9ea9BDDmBcn5lYyjPBgGJBeLLkcyBbZ56JbcBAxIncKKFw6r5M3j7tMcth
+f06K4cm7ngUg80ZEYK00ioAyFle56qPfZ5UM25QFzV38DGvusLl5H1bTtpz1ijh7
+kO/ehJVo4K64KVCbjOr1bavp665TtcIQX2qoPsnTZY30gQ/X/K2UJQSUE5Qc+o19
+BkvvVT5jNYdeLZHXbC6X4kXYNhFKZaz9nURgfaFQIeIEu/zmsIM8tcwLjZyF1veH
+wXXiBDXS3PNHXQnnpys=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keybucket.app.nordu.net/saml2/sp/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keybucket.app.nordu.net/saml2/sp/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">The KeyBucket</md:ServiceName>
+      <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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUNet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Leif</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet</md:Company>
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Berggren</md:SurName>
+    <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se.xml
new file mode 100644
index 00000000..68072b14
--- /dev/null
+++ b/swamid-interfederations-2.0/kiidp.ki.se.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kiidp.ki.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <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">ki.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Karolinska Institutet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Karolinska Institutet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+        <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ki.se</mdui:DomainHint>
+        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
+MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
+OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
+BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
+r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
+4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
+IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
+9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
+/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
+xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
+eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
+y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
+uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://kiidp.ki.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kiidp.ki.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kiidp.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kiidp.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAM0PmHWir6jrdlS8z2iCpGvo0CqaMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2tpaWRwLmtpLnNlMB4XDTEwMTEwOTA4MTgwNloXDTMw
+MTEwOTA4MTgwNlowFjEUMBIGA1UEAxMLa2lpZHAua2kuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCGXvXTTL9jXqeUnjwuEuPctScCyn+hRZQOmWm7
+OrvAHMIi+MKQMeSboowpbj+apvYbaxQFY4PH4287fd4OhYJGAdfNk68E7h+S5Ryq
+BVrJVM9SSGcwGAViCSq5YfuSo/ZtvMCGtQJ8ef1uu4sg4VJ+UzXtSjfRvKNko9Jm
+r3lJ3qDUp3ltm+r9Yk7EQ+tKfJFIg41HiAEeFl9Zztlp6DqbOlwXleUjCVPklCZV
+4emEO9flD+uk3zxp9y9TlcOAtuFNp6EmzH5Xc2LvWOusDZITsuNtL6OfadIixkfb
+IctgW4hgD0GOnDi2chYu4Yq3vets8GsQVkD0BAIXNxhJ1HEjAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2tpaWRwLmtpLnNlhiJodHRwczovL2tpaWRwLmtpLnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSDaQ4ABwxargqbAwedMAvPxCvABjANBgkqhkiG
+9w0BAQUFAAOCAQEAhHhPDWxChQt/L74HjwWVQHPQghTRcxJaQcBefWKH2yiERNyd
+/PKXU5G3RIzOS3Y3fYGwOMxH+PidKd48txJ50n/3VDI75g2MJsB+KJjLi2iVVkan
+xTyNLauF4A6ueNbn9V/myyZTa7kiru+iDSOasFSlLMf2leQXQHX3qBkOyBmy5Nu8
+eGhJzMVovMnIaDofE1FXMI6yTuF3KG+Uep7moWj+WHY028TupWsiAE4LVs793dAn
+y4PHmY+q902WpZA1xeckJAdpSjS5rLc3fWOEHBNbmhBkOhDr/tarFUyjxi4mKEhm
+uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kiidp.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kiidp.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Malin Westerberg</md:SurName>
+    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Eric Johansson</md:SurName>
+    <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>IT-support</md:SurName>
+    <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/laife-idp.lanet.lv.xml b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
new file mode 100644
index 00000000..b6a96411
--- /dev/null
+++ b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife-idp.lanet.lv">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
+BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
+MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
+dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
+GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
+ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
+az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
+/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
+BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
+QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
+Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
+0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
+OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
+itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
+tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
+SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
++edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
+G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
+iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
+1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
+RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
+P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
+9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
+TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
+74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
+BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
+BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
+MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
+dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
+GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
+ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
+az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
+/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
+BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
+QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
+Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
+0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
+OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
+itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
+tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
+SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
++edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
+G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
+iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
+1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
+RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
+P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
+9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
+TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
+74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">LAIFE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Latvian Identity Federation - LAIFE IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://laife.lanet.lv/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Administrator</SurName>
+    <EmailAddress>serviss@lanet.lv</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/laife.lanet.lv.xml b/swamid-interfederations-2.0/laife.lanet.lv.xml
new file mode 100644
index 00000000..2b17526e
--- /dev/null
+++ b/swamid-interfederations-2.0/laife.lanet.lv.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife.lanet.lv/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://laife.lanet.lv/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.lanet.lv</ds:KeyName>
+        <ds:KeyName>lanet.lv</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
+          <ds:X509Certificate>
+MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
+BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
+aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
+IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
+ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
+LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
+BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
+ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
+ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
+M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
+KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
+GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
+MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
+LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
+dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
+BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
+AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
+cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
+uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
+FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
+5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
+SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
+Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
+cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
+bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
+sn4gMvfrqL7d2Bc=
+         </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>*.lanet.lv</ds:KeyName>
+        <ds:KeyName>lanet.lv</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
+          <ds:X509Certificate>
+MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
+BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
+aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
+IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
+ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
+LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
+BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
+ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
+ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
+M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
+KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
+GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
+MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
+LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
+dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
+BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
+AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
+cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
+uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
+FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
+5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
+SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
+Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
+cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
+bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
+sn4gMvfrqL7d2Bc=
+         </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <SurName>Administrator</SurName>
+    <EmailAddress>serviss@lanet.lv</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
new file mode 100644
index 00000000..ecf1755a
--- /dev/null
+++ b/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lanet-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lanet-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - LANET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">LANET - LANET IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.lanet.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
new file mode 100644
index 00000000..061ad522
--- /dev/null
+++ b/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://liepu-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://liepu-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - LIEPU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.liepu.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
new file mode 100644
index 00000000..04bcb02b
--- /dev/null
+++ b/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lma-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lma-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - LMA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.lma.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
new file mode 100644
index 00000000..e1fa1bed
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
+5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
+qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
+D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
+0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
+Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
+kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
+bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
+haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
+chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
+qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
+KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
+OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
+5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
+qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
+D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
+0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
+Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
+kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
+bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
+haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
+chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
+qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
+KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
+OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e29</OrganizationName>
+    <OrganizationName xml:lang="en">e29</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>LMU-Helpdesk</GivenName>
+    <SurName>LMU-Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@campus.lmu.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
new file mode 100644
index 00000000..48eb765b
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuza-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuza-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - LMUZA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.jvlma.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr.xml
new file mode 100644
index 00000000..286b18e6
--- /dev/null
+++ b/swamid-interfederations-2.0/login-idp.auth.gr.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-idp.auth.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">auth.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
+                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
+                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
+                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
+                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
+                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
+                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
+                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
+                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
+                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
+                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
+                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
+                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
+                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
+                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
+                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
+                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
+                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
+                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
+                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
+                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
+                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
+                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
+                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
+                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
+                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
+                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
+                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
+                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
+                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
+                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
+                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
+                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
+                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
+                        </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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-idp.auth.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-idp.auth.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">auth.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
+                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
+                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
+                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
+                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
+                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
+                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
+                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
+                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
+                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
+                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
+                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
+                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
+                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
+                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
+                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
+                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
+                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
+                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
+                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
+                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
+                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
+                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
+                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
+                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
+                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
+                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
+                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
+                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
+                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
+                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
+                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
+                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
+                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
+                        </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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Aristotle University of Thessaloniki</OrganizationName>
+    <OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.auth.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.auth.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Helpdesk</GivenName>
+    <SurName>Network Operations Center</SurName>
+    <EmailAddress>support@auth.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Helpdesk</GivenName>
+    <SurName>Network Operations Center</SurName>
+    <EmailAddress>support@auth.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
new file mode 100644
index 00000000..74e33b83
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aai.pionier.net.pl/IdP/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-07T14:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">aai.pionier.net.pl</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PIONIER Consortium</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+            PIONIER Consortium Identity Provider 
+         </mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDmjCCAoICCQDmaHpUoCXQpDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwHhcNMTMwNDIyMDkyNjI3WhcNMjMwNDIyMDkyNjI3WjCBjjELMAkGA1UEBhMCUEwxMTAvBgNVBAoTKFVuaXdlcnN5dGV0IE1pa29sYWphIEtvcGVybmlrYSB3IFRvcnVuaXUxKTAnBgNVBAsTIFVjemVsbmlhbmUgQ2VudHJ1bSBJbmZvcm1hdHljem5lMSEwHwYDVQQDExhsb2dpbi5hYWkucGlvbmllci5uZXQucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0Uf5C3sRuXMaoCQtvE47bf+tWUJX8v8KCIYaAFylqJuMLX7WDM54vtgjGsrLzY9KC3quHEG2H5CtkCnAiRLuz1veufuIkKqXl2vnbVmVwc4f8uXrDGnzEQb9Pa9Nu1Qu6G3WytCHhZJUJ6wL/VyYbONnIxxs99obLxMIJ6knMmeDl/nkM5h5h2/pRTltzbw1v0+YWp8uoX/6WmFasOY2RWy7s27L3ooN4gkRgvfaj3PZ+uRopWg8rssvMoTngQALZDlw1mlzrORupnigyQYsHjTcDZTLm7Dt9QF0WVgHfYNnz3KynCceSqQQL+b2OsTAv7UYBs6h09SvMPz6Ew/KdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEBhyUU61t7kzq6tlZKvsyVlAF2jqyEZCijaeo7kOragifoTrFPLXHCiIDYvfgYkKx3mx/tsus8ntm7zigb2+nbBKNgMux0GQpeu2sXRuSdUZ2qRUzzblXN6x9JmqMXTchTiw9+SCoxuJZ2Di/d0yVSg0NcHNaB42HKE5PenuwnSU9Yo26JgSA3xJfWYFkAcT676yzySgRXasbzv2idBpKYXY2kECoggrzmyxfkuMCHWENk+k06EM1mVuS6gdU/SsJWksLDG+6gjah0UHMpNaXjGsZsNIw/6SkdJOex3Pp1CpW8/nxQyxkftFSIhEYvqbWBVL+VfiAjG9JrZC4o5x/8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aai.pionier.net.pl/IdP/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">PIONIER Consortium</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">PIONIER Consortium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">Konsorcjum PIONIER</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.pionier.net.pl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>PIONIER IdP</md:SurName>
+    <md:EmailAddress>admin@aai.pionier.net.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
new file mode 100644
index 00000000..6650ca1d
--- /dev/null
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.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">athena-innovation.gr</shibmd:Scope>
+      <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>
+    </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
+                        </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:transient</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"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.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">athena-innovation.gr</shibmd:Scope>
+      <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>
+    </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
+                        </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:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</OrganizationName>
+    <OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
+    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>Research Center Athena - Institute for the Management of Information Systems</Company>
+    <EmailAddress>staff@imis.athena-innovation.gr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.bme.hu.xml b/swamid-interfederations-2.0/login.bme.hu.xml
new file mode 100644
index 00000000..586bc6ca
--- /dev/null
+++ b/swamid-interfederations-2.0/login.bme.hu.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.bme.hu/idp/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">bme</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVALPowTex/0kkPUAX6SJu1p93b0VwMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTAeFw0xMTEwMDMwMTE0MzVaFw0zMTEwMDMwMTE0MzVaMBcxFTATBgNVBAMTDGxvZ2luLmJtZS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALFQWz8d0dz50J5zJVgQPv739xAPTQjQV6RwQdE9u+ajgytrDy+VuCrBGluvGspGekOjhlEESc7sZ0l92wzEdcdG0McLeg7PL9V4JE9qwKJO289t403EFbxCqekjeZWp3KDhHpDefLOUywYMQ1mPNfYbVRRFg82VtPL+G3FMTSQBWrnjWYLshVjexbHwbK1rMiy8MHBbjVAF27v6RvGHLhzPhNNW11+lqweogXc3d73fgkIBMicKm5SgW/jQvBtlODy49xeoef1GD6MUgckPRpqIyXdd01rqpdGqeDJOyjamB5VI+LMjjpNr6h2pA0LjNNm0RZJVobbgzfFpdzwI09ECAwEAAaNfMF0wPAYDVR0RBDUwM4IMbG9naW4uYm1lLmh1hiNodHRwczovL2xvZ2luLmJtZS5odS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbB8MWrjcjCvj3wlxfUMUsdRjYd4wDQYJKoZIhvcNAQEFBQADggEBAK1vfjY8DTLVqrZm7G5g+PSDRalpmk5Iwg5c/flDtGJG8LoHaX5y9AGNyXNOqgfzWw/UITQnl6J1L5o8n/AHYv6B1BHY0VqGBdIg/JvIzX1sODAdbOlYvLdhYqACjK+S/KNW7H0ASh2sY1OVSc4/nOLfdJYgoZ2YZphvWu3zn7oEAaEBL1G1kaHYRTuJcRrS6QtL2P2jj+McxtRwaC5QgcMyewJW6I/608AV0/0++UUqWpb29HUit4H03Mt/7qc2ekLuPcOk+AEXajE97z8Ia99IrBj/n3N4edS+Oj570z1SMzhtuCKzErQeySAtySu6EbCabd0L2JXIDLr2fjc8B+s=</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>login.bme.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationName>
+    <OrganizationName xml:lang="en">Budapest University of Technology and Economics</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">https://bme.hu/</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://bme.hu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Gyenes Tamás</SurName>
+    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Gyenes Tamás</SurName>
+    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Gyenes Tamás</SurName>
+    <EmailAddress>mailto:tom@impulzus.bme.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
new file mode 100644
index 00000000..0445d7d8
--- /dev/null
+++ b/swamid-interfederations-2.0/login.du.se.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.du.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
+        <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>du.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAPJo+xMJRgt7yTXfyDqsZSyRFE0zMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2xvZ2luLmR1LnNlMB4XDTExMDIwNDEzMzg1MloXDTMx
+MDIwNDEzMzg1MlowFjEUMBIGA1UEAxMLbG9naW4uZHUuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCKFHqKqppmo8B66lFgTbIQDdDNqlBpsrhjZx4m
+l4ay7TR/Q9JhxJCpsg3fttFyYbG6pl4PViMMt6jagpYYMBlBBKGUDefAT95oAcBN
+eRlkTxXfXG4XCS1phIIc6H9Kt8HwFadqLIgx+9ICCuyTZicPIwnUBt+TS4A+hz6k
+8KA87QWvnhteMHpu4UjIL8YRUAdNbFbRV9AuOmaR9HP11yueQd3B+5XnTt8x+JaO
+yWgsbUvBeGKIXPtGm70UgXeBi32vr6LtP5s2ijtj4zORMh5dxAkrjE0hO96E3D6Y
+riLlccqVMGTYhweDuIE4HJA+sY8vFXxSTsL193erJ6ooBUWxAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2xvZ2luLmR1LnNlhiJodHRwczovL2xvZ2luLmR1LnNlL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTYD58W7KLBxdd1F6vo5xlukwwdOTANBgkqhkiG
+9w0BAQUFAAOCAQEAXZRof2FZml44oPJ+2GkhIIK0U2t143xH4Z4J2iPbTjQyNfeo
+eusGj+AvLkdkHLisqz8HTQC93sSYwPrQ1PMrqwAmnJZkhcySTto15Rgi5yNWsUFU
+E5RfYEcGj1P2R+uxUpCZ3qf9usCpGf5ao5rCoOjxtxGyv3PqDFTBwkjheuASpsug
+KnPqLMWV0RL1gmJhfAoCbhm+rM8FZZLXloDuV+Xzb0OmjruPupqtTJpHVBkaQ3OI
+2FIPaCf07HjPPcy4s9mQJGq9TEBKJ+WWwoT5ZvhYErkO7m2iQNsXUqCk/dt2Tp7e
+GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">DU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Dalarna University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778891</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Dalarna University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778891</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Dalarna University</Company>
+    <SurName>Högskolan Dalarna Support</SurName>
+    <EmailAddress>support@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778888</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz.xml b/swamid-interfederations-2.0/login.feld.cvut.cz.xml
new file mode 100644
index 00000000..3ccd3bac
--- /dev/null
+++ b/swamid-interfederations-2.0/login.feld.cvut.cz.xml
@@ -0,0 +1,192 @@
+<?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://login.feld.cvut.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">fel.cvut.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CTU FEE in Prague</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro ČVUT FEL v Praze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fel.cvut.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="53">https://login.feld.cvut.cz/img/logo_cvut_40pix.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>
+MIIEkjCCA3qgAwIBAgIQCpc8Q9h2foS8MtbTcL2TMDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEwMjAwMDAwMFoXDTE2MDEwMjIzNTk1OVowWDELMAkGA1UE
+BhMCQ1oxLTArBgNVBAoTJEN6ZWNoIFRlY2huaWNhbCBVbml2ZXJzaXR5IGluIFBy
+YWd1ZTEaMBgGA1UEAxMRbG9naW4uZmVsLmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDuL8a7onZijGOC+JeP1z4yMbCtATlv2VP3u2+pn4U
+sK3mwHipcfjhMwLpSboTtId21HFDCD6RAogz5Zd0X9GSrI8pLWVT4cM/VzBWvw3c
+noSm9xswSvcOZ3uXmCd06HlpabZGZuWg5jXO4EdjqFtjVD9tONguyal8H5sBRRb9
+Z0ShL0/a27MMrdjKl5gOx43hhAbHyAH4fQ2gStBsn8WZ1g1zj0bLit32cvcnECbe
+7kzltbZa+gX2MrhiEAe0ZBuqcjg4BuZ00ZDfKf9be2MyisTXR5dIrG5f96xd0gJ4
+eqnSMGDchPeXRoMz584b+sFgfDRmmT1cKJbPfpoW6k8RAgMBAAGjggF4MIIBdDAf
+BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6YyoMBPg
+DqpgaarrFV36wd07sOUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9n
+aW4uZmVsLmN2dXQuY3qCEmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUF
+AAOCAQEApmlqVO5GPaYBHwWXEHs5jvGaqSfcJvN0HbKC7bbTR1O0WqNLTUVVK9k3
+z+sRpGzVc6xAq79odCI0cC+uBDzQ5hXKAh7kSRpG85MhX06MMbqDdZkx+qDXnVZg
+wpzFYPxdkeDb5eLm2anMYKMYuAMne+wbtKLy6TO4dtM8RL2FgtZy1j1Rf+u3UFtT
+Do+Wm6n0YwDPphP6mX6hhILlCPsJ50715kIsVKr6d6o8yyX7Lhn2eqOu8/QpNNUG
+UKrVFWduXxoAgSn9iHaBAN4WgfvmOGOxvxJgSaH8aZXv61N9jL1IgwrYPfdQb/lX
+dj+n3gr4xtn/PGM1C5O+OEFGmi+G9g==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIElDCCA3ygAwIBAgIRAMqRRTZJu2RDt+d/vvzzW68wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMjgwMDAwMDBaFw0xMjEyMjcyMzU5NTlaMFkxCzAJBgNV
+BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+cmFndWUxGzAZBgNVBAMTEmxvZ2luLmZlbGQuY3Z1dC5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMFmy3m3rFgI84okN8+0jx8V+cRfSqzga+i51UYO
+gJP0TD9fhct4I/b1vHsveBqBpsNH/4wZMJEF6U6xmzmb9RPzc765DnlcMa8syfQ5
+74X5+0qa7iVb8nlLX+uiEZ2cSQ5sZIaCnnU+hHyla6EtG6W3HwiJZhT2YZ9Y5d1/
+YwdM7+fE9e6pagx1xDIPWBDg1IucEyrZdSJlCDsjAKmHHL0th09AA93/OUendsh0
+oNRYImAJ6ZCawbiRYgS2gR+mGAoarro/7LEMbg/urwOpPyM9oMu7XGtEM2suUmoj
+KaDbv6s1dXP5sBsPxdaXLsfm814qYjePlJC46SaYoJa8Y30CAwEAAaOCAXgwggF0
+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ8JRmP
+ILte2LuZmgYFZlYlOgkZYzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
+AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAwBgNVHREEKTAnghJs
+b2dpbi5mZWxkLmN2dXQuY3qCEWxvZ2luLmZlbC5jdnV0LmN6MA0GCSqGSIb3DQEB
+BQUAA4IBAQA9bxujyO9ypGL6XGHfGfxwO/PbfO6lFIwaRHuq7s7qzSO84MY4dm1b
+hrXdRpHh/ytWuFVjG8hkrGxWeXxTvmnT/7UZkiunIS1W0bv+UsjLEE2JxQliZH5b
+fvQo+TzGjSc+/G69aWsiGOBrMNIZo5G7je7jPqXT8dxYybA/H5kRPCHIWytTo2B8
+eV8VdpcVEiiwDUrdTOqx9ovdG71AF23oB3gEGurmjaO1KzON0afJX0jbdhPeHgZk
+w3yAAidVUbdnIKxRX7apmSjRR8WP6Wbt3Nc/O7QVUKQ8mbu5WgycixP9UoHhWJb1
+OD+lrV+pj5G00QitlYmP1PhegXcXmrxz
+             </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.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://login.feld.cvut.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.feld.cvut.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">fel.cvut.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEkjCCA3qgAwIBAgIQCpc8Q9h2foS8MtbTcL2TMDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDEwMjAwMDAwMFoXDTE2MDEwMjIzNTk1OVowWDELMAkGA1UE
+BhMCQ1oxLTArBgNVBAoTJEN6ZWNoIFRlY2huaWNhbCBVbml2ZXJzaXR5IGluIFBy
+YWd1ZTEaMBgGA1UEAxMRbG9naW4uZmVsLmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDDuL8a7onZijGOC+JeP1z4yMbCtATlv2VP3u2+pn4U
+sK3mwHipcfjhMwLpSboTtId21HFDCD6RAogz5Zd0X9GSrI8pLWVT4cM/VzBWvw3c
+noSm9xswSvcOZ3uXmCd06HlpabZGZuWg5jXO4EdjqFtjVD9tONguyal8H5sBRRb9
+Z0ShL0/a27MMrdjKl5gOx43hhAbHyAH4fQ2gStBsn8WZ1g1zj0bLit32cvcnECbe
+7kzltbZa+gX2MrhiEAe0ZBuqcjg4BuZ00ZDfKf9be2MyisTXR5dIrG5f96xd0gJ4
+eqnSMGDchPeXRoMz584b+sFgfDRmmT1cKJbPfpoW6k8RAgMBAAGjggF4MIIBdDAf
+BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6YyoMBPg
+DqpgaarrFV36wd07sOUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9n
+aW4uZmVsLmN2dXQuY3qCEmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUF
+AAOCAQEApmlqVO5GPaYBHwWXEHs5jvGaqSfcJvN0HbKC7bbTR1O0WqNLTUVVK9k3
+z+sRpGzVc6xAq79odCI0cC+uBDzQ5hXKAh7kSRpG85MhX06MMbqDdZkx+qDXnVZg
+wpzFYPxdkeDb5eLm2anMYKMYuAMne+wbtKLy6TO4dtM8RL2FgtZy1j1Rf+u3UFtT
+Do+Wm6n0YwDPphP6mX6hhILlCPsJ50715kIsVKr6d6o8yyX7Lhn2eqOu8/QpNNUG
+UKrVFWduXxoAgSn9iHaBAN4WgfvmOGOxvxJgSaH8aZXv61N9jL1IgwrYPfdQb/lX
+dj+n3gr4xtn/PGM1C5O+OEFGmi+G9g==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIElDCCA3ygAwIBAgIRAMqRRTZJu2RDt+d/vvzzW68wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMjgwMDAwMDBaFw0xMjEyMjcyMzU5NTlaMFkxCzAJBgNV
+BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
+cmFndWUxGzAZBgNVBAMTEmxvZ2luLmZlbGQuY3Z1dC5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMFmy3m3rFgI84okN8+0jx8V+cRfSqzga+i51UYO
+gJP0TD9fhct4I/b1vHsveBqBpsNH/4wZMJEF6U6xmzmb9RPzc765DnlcMa8syfQ5
+74X5+0qa7iVb8nlLX+uiEZ2cSQ5sZIaCnnU+hHyla6EtG6W3HwiJZhT2YZ9Y5d1/
+YwdM7+fE9e6pagx1xDIPWBDg1IucEyrZdSJlCDsjAKmHHL0th09AA93/OUendsh0
+oNRYImAJ6ZCawbiRYgS2gR+mGAoarro/7LEMbg/urwOpPyM9oMu7XGtEM2suUmoj
+KaDbv6s1dXP5sBsPxdaXLsfm814qYjePlJC46SaYoJa8Y30CAwEAAaOCAXgwggF0
+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ8JRmP
+ILte2LuZmgYFZlYlOgkZYzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
+AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAwBgNVHREEKTAnghJs
+b2dpbi5mZWxkLmN2dXQuY3qCEWxvZ2luLmZlbC5jdnV0LmN6MA0GCSqGSIb3DQEB
+BQUAA4IBAQA9bxujyO9ypGL6XGHfGfxwO/PbfO6lFIwaRHuq7s7qzSO84MY4dm1b
+hrXdRpHh/ytWuFVjG8hkrGxWeXxTvmnT/7UZkiunIS1W0bv+UsjLEE2JxQliZH5b
+fvQo+TzGjSc+/G69aWsiGOBrMNIZo5G7je7jPqXT8dxYybA/H5kRPCHIWytTo2B8
+eV8VdpcVEiiwDUrdTOqx9ovdG71AF23oB3gEGurmjaO1KzON0afJX0jbdhPeHgZk
+w3yAAidVUbdnIKxRX7apmSjRR8WP6Wbt3Nc/O7QVUKQ8mbu5WgycixP9UoHhWJb1
+OD+lrV+pj5G00QitlYmP1PhegXcXmrxz
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.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">CTU FEE</OrganizationName>
+    <OrganizationName xml:lang="cs">ČVUT FEL</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Novakov</SurName>
+    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fhv.at.xml b/swamid-interfederations-2.0/login.fhv.at.xml
new file mode 100644
index 00000000..0f7ebb70
--- /dev/null
+++ b/swamid-interfederations-2.0/login.fhv.at.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fhv.at/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2011-07-26T12:52:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhv.at</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclv.net</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">Fachhochschule Vorarlberg</mdui:DisplayName>
+        <mdui:Logo height="57" width="113">https://login.fhv.at/fhv-logo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVANvjM2hsZMTPMmIUd7JVjV9bZ4d1MA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDAeFw0xMTA3MjYwOTQ1MTRaFw0z
+MTA3MjYwOTQ1MTRaMBcxFTATBgNVBAMTDGxvZ2luLmZodi5hdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKxwsD9+OJckD5tkuEmbHOuzwYAtkRyXfVuV
+/Y4up4H8I+eUgqr44g+o4IiIjW/MQHqiottVUUeimuFzbiVwsr/VRzMQBJqNiE/h
+eT2TOnUzHh+nPuZDtVzwy2S5lMxpGI7a5v6IwGhLjf6jV9jJjB1VtQys6ofH7uqv
+jF75Jkz7X5cuPMRCXGaXEecWKeOLX0PaMsptIOUR+a6YXX2dOJbPJojH/E0OOlg2
+XxoizHzZceZF7K3Tr1SZX7mT7TjcFjCOIcbiL0hkrto5oSBkY1G77d3fdkyZvO8u
+65iPN5rVoJSuYe7aYjVqlDECQSHH46vNJXanepMmZ+iPU5K0tkECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMbG9naW4uZmh2LmF0hiNodHRwczovL2xvZ2luLmZodi5hdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1hyr7QdkMxYmdbqg/wxKiwGh9nUwDQYJ
+KoZIhvcNAQEFBQADggEBAHZCy5j4cx8jyYL6m6sY0oIzX9F5kVGPdKSXhjE85RrY
+GzGlRpXjBTA8CPlxnu99Wt4jZ2jjudwrw/bHLPwxOkZNALxj4HUa7T0cdWXCj3lR
+1b8iI5tXTYHmgjCbl+UTl/WA8YVQvA4v+2RaBMduspAFsvjwZDDOXvskLB4Aflbu
+ewmlLixdIpZYWbQTkSovm0InLzBuoF77CFul8Nt2oIlbLg9Qfd4f94RsaNx/2MrZ
+/YXD0gncEwV9ijUqIUGJuGicMrTGeLhxlr6bltA8K9RyTgAU3dCImRUX0tbK0jRa
+ApOxw/gcmrRQwbhGEghVXhv3KlZ/xEkpVndXwiF651w=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fhv.at/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhv.at/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fhv.at/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhv.at/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Fachhochschule Vorarlberg GmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Fachhochschule Vorarlberg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Vorarlberg University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhv.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhv.at/en-fhv-portal?set_language=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>FHV</md:GivenName>
+    <md:SurName>System Management</md:SurName>
+    <md:EmailAddress>mailto:sysadmins@fhv.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi.xml
index 8b8bd63e..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>Ville-Pekka</md:GivenName>
-    <md:SurName>Vainio</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/login.liu.se.xml b/swamid-interfederations-2.0/login.liu.se.xml
new file mode 100644
index 00000000..84272ba6
--- /dev/null
+++ b/swamid-interfederations-2.0/login.liu.se.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.liu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Linköpings Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Linköpings universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students at Linköping University.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.liu.se/?l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.liu.se/?l=en</mdui:InformationURL>
+        <mdui:Logo height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
+        <mdui:Logo height="53" width="80" xml:lang="sv">https://login.liu.se/idp/images/logo-80x53-sv.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="sv">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="68" width="350" xml:lang="en">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
+        <mdui:Logo height="53" width="80" xml:lang="en">https://login.liu.se/idp/images/logo-80x53-en.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://login.liu.se/idp/images/logo-50x50.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://login.liu.se/idp/images/logo-16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>liu.se</mdui:DomainHint>
+        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
+dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUUGevf/6+3wexHl4UyWmMfjha+8owDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMB4XDTA5MDYyNTA2Mjg1NloXDTI5
+MDYyNTA2Mjg1NlowFzEVMBMGA1UEAxMMbG9naW4ubGl1LnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkdGaEeZYE4lLbCTP3I/7SWH2dI4RfbVp0bPH
+X3TSDGUAJMf8lVwignl37pypkj1it/Ea1oOs1QAUUJF2s7eDKbbsQZ6IMEZHUCG9
+2yBt6cAA7HH8XyhyQodkTZd6JhY/HJY1oAiKXar7JSnxnVdg6365Z4rP+W4UHcHM
+ePgj6SqR0eW6qXmEIx9a/cyJ+s/R5cUiTrNDL9c0FH/watGYgesLxCxSSgijW7L1
+Cobl5Y5+Wr8i3sPPNVVtHXsp1aRI4G4YWW2qsoPF94s9f+LguJ+vHMT2URqplOZ3
+g41V7NFMqSw8f7n32BKl7ekAVBfhAwMuiKSENCuJ1vWHsXS7wwIDAQABo18wXTA8
+BgNVHREENTAzggxsb2dpbi5saXUuc2WGI2h0dHBzOi8vbG9naW4ubGl1LnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSouPd/n3U2de/t4ArJMSZcZGlsrjANBgkq
+hkiG9w0BAQUFAAOCAQEAdupL+cmtm9wOczmRze5JGpSkrEnJLWOABVH71QGhRPd3
+bEA93XLjwiO9NPuFyLrb03IUrcgdlgkxnCoq2dla2IQBI6ky+VSuc4lCsdanI+XB
+t2SymRPiqJ60K04Rm4TYOZHsDVHPO3dE3f4mjbhx/irlPmDIM+eB88SbT1nPRQfv
+G2bsafC6oxZjtT5CDJP30lUpieKkmIneVjTmYHBLQmWvl0G5o5j5OLtVj1xhfz9r
+zB2373DVTdsTnFIbFLDF8bGXt1jhxNOT5cxviUYKI+L1VLwKRjWlFd2tUMMKKz/I
+dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">LiU</OrganizationName>
+    <OrganizationName xml:lang="en">LiU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Linköpings Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.liu.se?l=en</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT SAML admins</SurName>
+    <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Linköping University</Company>
+    <SurName>LiU-IT Helpdesk</SurName>
+    <EmailAddress>helpdesk@liu.se</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr.xml
new file mode 100644
index 00000000..5b176203
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.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">ntua.gr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Technical University of Athens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://login.ntua.gr/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="el">https://login.ntua.gr/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ntua.gr</mdui:DomainHint>
+        <mdui:IPHint>147.102.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:648:2000::/48</mdui:IPHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
+                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
+                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
+                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
+                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
+                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
+                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
+                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
+                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
+                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
+                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
+                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
+                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
+                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
+                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
+                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
+                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
+                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
+                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
+                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
+                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
+                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
+                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
+                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
+                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
+                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.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">ntua.gr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIEmzCCA4OgAwIBAgIBTDANBgkqhkiG9w0BAQUFADA4MQswCQYDVQQGEwJHUjEN
+                            MAsGA1UEChMETlRVQTEaMBgGA1UEAxMRTlRVQSBDQSAyMDA2LTIwMTgwHhcNMDcw
+                            MzIzMTE0NjAyWhcNMTcwMzIwMTE0NjAyWjBTMQswCQYDVQQGEwJncjENMAsGA1UE
+                            ChMEbnR1YTEQMA4GA1UECxMHc2VydmVyczEWMBQGA1UEAxMNbG9naW4ubnR1YS5n
+                            cjELMAkGA1UEBRMCNzYwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZ9Qnww
+                            BRe5Kc0EYuVdbkMASUIBc624cYA8QCv9e0S769ePElXSndg7caaSRXG8pN4gkc9+
+                            LUhvqefUt3ihIDsOIcdDW1tGOJ5b9UH9zjRpUCjubKOcYSxaxFjs+15RGhMweSwm
+                            DwYcFLpmDvFC7vbh+X8rt5ri4S3YSpT9eZdVAgMBAAGjggIXMIICEzAJBgNVHRME
+                            AjAAMEwGA1UdIARFMEMwDQYLKwYBBAGHSQMCAQEwMgYLKwYBBAGHSQMBAQEwIzAh
+                            BggrBgEFBQcCARYVaHR0cDovL2NhLm50dWEuZ3IvY3BzMBEGCWCGSAGG+EIBAQQE
+                            AwIGQDALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIQYJYIZIAYb4
+                            QgENBBQWEldXVy1TZXJ2ZXIgb2YgTlRVQTAdBgNVHQ4EFgQUiEqRWLpVT7bpJ6K4
+                            9EfC0UPUGpkwWwYDVR0jBFQwUoAUfNqsx+A0dIrLwYwYsWoolK95CJWhN6Q1MDMx
+                            CzAJBgNVBAYTAkdSMQ0wCwYDVQQKEwROVFVBMRUwEwYDVQQDEwxOVFVBIFJPT1Qg
+                            Q0GCAQIwLwYDVR0RBCgwJoEPbm9jQG5vYy5udHVhLmdyhwSTZt7dgg1sb2dpbi5u
+                            dHVhLmdyMBUGA1UdEgQOMAyBCmNhQG50dWEuZ3IwMgYJYIZIAYb4QgEEBCUWI2h0
+                            dHA6Ly9jYS5udHVhLmdyL3B1Yi9jcmwvY2FjcmwuY3JsMDIGCWCGSAGG+EIBAwQl
+                            FiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDA0BgNVHR8ELTAr
+                            MCmgJ6AlhiNodHRwOi8vY2EubnR1YS5nci9wdWIvY3JsL2NhY3JsLmNybDANBgkq
+                            hkiG9w0BAQUFAAOCAQEAXHXewa99f7iIlhvgdMWp6NXfT9TG9FCGWhtO2V5GeUii
+                            2TBYddAH6+tYrVlJ4cN6p444Dhvin8eVA/Y0WfeVll4YasViq6zxSH9FLZkszbKr
+                            f7CfFyYqChsjcrn/oGJWsfsqGqMGPfdAQSkkpyGOHVMMARCY+gP0S973yK89frkA
+                            QGG+elGtKx786IeEEbm4YS4Z0VMkD3obJk/QRmiy6lvHadODGcpiGLCZq9G1Es2i
+                            mcNedy126VjwlNcg6XBbl0shvgGkjqzA89TPFY/FwtklJGfNl8SP88p8I41CsM8Q
+                            /PFGb40C/OoiQncMfOelJJXz6O+w4jNGdUoJdTCpdQ==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+                            MIIDFDCCAfygAwIBAgIJAOE9jL5hLZ+yMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+                            BAMTDWxvZ2luLm50dWEuZ3IwHhcNMTMxMjExMTMyNzM3WhcNMjMxMjA5MTMyNzM3
+                            WjAYMRYwFAYDVQQDEw1sb2dpbi5udHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOC
+                            AQ8AMIIBCgKCAQEA9PPd/C1Smrn+DH1bYdJ24qqvA7aDt7izs/c9bmsF1/zOumIj
+                            3Tmi9V/zmeNt2yiV/Nva2ZU3M/cTUxZST7XYWz+758EyqmvKVvHgyOmmF8JdV+9r
+                            hFT3R3DEdDnGnep4N7QZySOQ/mOp3IsY2Wxqka3NU672keZq/VhV/B1MPDqhqPGt
+                            TPeW/NJGjo2UrMKkeyJLCHQJeNbKOOSzefc5TJYFJHLXqGs7DWIXwqqab0MPJ3Na
+                            N7Ap0SEIZWpNS7u/lAAS//1HJQ26zW15GcUhxgi2pMk3GHs6uwWF+DYLEbWg17MQ
+                            Er9MFbftJjf9V4GOfUILDvgNlutCPnmM6aB4gQIDAQABo2EwXzA+BgNVHREENzA1
+                            gg1sb2dpbi5udHVhLmdyhiRodHRwczovL2xvZ2luLm50dWEuZ3IvaWRwL3NoaWJi
+                            b2xldGgwHQYDVR0OBBYEFNP8/C26TomQ3yAZFMY2W84V40ihMA0GCSqGSIb3DQEB
+                            BQUAA4IBAQAv4cC1fu39MNQlvoSY/k/kV7cbkmS30FfVlsuwdfZQJO/3r2a/E7kd
+                            l9QR9Us+Eraabx6ccq6BYbtsMaXkDrgKPL6KfXFWNIjbizqmmvgdlB2ptYYKN7d0
+                            Bz2L7y0ZWkKApEBDVMUwmBHsS18xs35xchKyezTAralRy3tHBAop93jBumHiRRYF
+                            RuRSEM4KM01/DkDDwkCXWEWu0TolnSozTFtYddwi1u48s0tq4TSBkYk3C7XoyCol
+                            PCUfUb8+3VLdMNqkSkE22WQx9th9BNNWs3e4QdrRgnh/9gKInZCzmrXU8ymWBhmj
+                            1f80WSd+TnQAp2UMPIXxxOOSGhI5NyQn
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">National Technical University of Athens</OrganizationName>
+    <OrganizationName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">National Technical University of Athens</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ntua.gr/</OrganizationURL>
+    <OrganizationURL xml:lang="el">http://www.ntua.gr/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>National Technical University of Athens - Network Management Center</Company>
+    <EmailAddress>noc@noc.ntua.gr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <Company>National Technical University of Athens - Network Management Center</Company>
+    <EmailAddress>help-data@noc.ntua.gr</EmailAddress>
+    <TelephoneNumber>+30-210-772-1861</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org.xml
new file mode 100644
index 00000000..bd8fb45f
--- /dev/null
+++ b/swamid-interfederations-2.0/login.terena.org.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.org</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">terena.nl</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="nl">TERENA Secretariat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TERENA Secretariat</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">TERENA Secretariat</mdui:Description>
+        <mdui:Description xml:lang="en">TERENA Secretariat</mdui:Description>
+        <mdui:Logo height="60" width="120">https://static.surfconext.nl/media/idp/terena.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">TERENA Secretariat Trans-European Research and Education Networking Association </mdui:Keywords>
+        <mdui:Keywords xml:lang="en">TERENA Secretariat Trans-European Research and Education Networking Association </mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+3P2Tx32Cq1WXCYkxLaPI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/add0aa33e5963c5406d2b82f6b1d9f58"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="nl">TERENA Secretariat</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="nl">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA Secretariat</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="nl">http://www.terena.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufrgs.br.xml b/swamid-interfederations-2.0/login.ufrgs.br.xml
new file mode 100644
index 00000000..72d3f575
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ufrgs.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.ufrgs.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">ufrgs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrgs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrgs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
+DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
+Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
+bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
+AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
+cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
+ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
+2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
+jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
+bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
+qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
+OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
+Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
+71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
+l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
+Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
+OZgo7MlCCIU7m3ddaIg=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.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">ufrgs.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxMjAwBgNVBAoTKVVuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gU3VsMQwwCgYDVQQLEwNDUEQx
+JTAjBgkqhkiG9w0BCQEWFmZvc2NhcmluaUBjcGQudWZyZ3MuYnIxFTATBgNVBAcT
+DFBvcnRvIEFsZWdyZTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5sb2dpbi51ZnJncy5icjAeFw0xMzAxMDMxNzU3NDVa
+Fw0xNjAxMDMxNzU3NDVaMIHCMTIwMAYDVQQKEylVbml2ZXJzaWRhZGUgRmVkZXJh
+bCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMDQ1BEMSUwIwYJKoZIhvcN
+AQkBFhZmb3NjYXJpbmlAY3BkLnVmcmdzLmJyMRUwEwYDVQQHEwxQb3J0byBBbGVn
+cmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMObG9naW4udWZyZ3MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8fLEh7cCQVt0LwqhO5aqUVgh+UDY14fXIi/NLIF/cGW8fz/sL+ZQ/A8/w
+ghXVH/+Fz4BQT1l/ON+wXhgyzum26Ic28+v5U8+zFIw56Qt762t+LNFigyUUnNDB
+2wsctazoyvp0BsEZm/NC+9icGjOZbDzJDMa5upsDsxxCrI3Eeu8JLPQ5F8/uQgJw
+jtFvDJhjixBYeahlQ93oR7ZFSJneFqLoIrE5CgnK0N51OkshiQtKduNTN+NfRofG
+bqU+nfMGk5gRNfd9O0I4KapVxfSj3gjg4HJjX/hvaT/gLDDMiICZSyOY2Lx+Vjbs
+qBqdgRIx36iLCSOGtUwvEk7VpxZPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIUJ
+OF+eWl6O7zZ3Pbb9nvsMx8RV8SgfgdKuATFboeHCWsuc0U/YM+RR3f9fInMLjBQC
+Dm+rvGhVjZgvgQJPenkIy49CZ4OmbRGCerZi2bFmB59cVYCisguPcc7xuJrk8hQI
+71Pztij+L2DR4WJ3GLhhF4wR+3Nr4ElHZyhP6WpMx+DMFfiHVHfVtZkQakpgDOhr
+l5reSTUY4gaj4KVESTXBsgJ+2R7xwwJSiNbtbTixhY8P2KkKHQ6LHigc3EhDA6YW
+Dh7IIF01BPWbOdLHGgWAGTEMXmOoSd0iv7mgHOSCbjETABC8zl5tn1WRaZfIEOsE
+OZgo7MlCCIU7m3ddaIg=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.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">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufrgs.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Everton Foscarini</SurName>
+    <EmailAddress>foscarini@cpd.ufrgs.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
new file mode 100644
index 00000000..4a8357d9
--- /dev/null
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp.lu.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDG
+x1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsG
+A1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4
+GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1ZBGi2uWZ
+xKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARV
+oZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQyOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDG
+x1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsG
+A1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4
+GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1ZBGi2uWZ
+xKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARV
+oZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQyOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
new file mode 100644
index 00000000..3e3c7e64
--- /dev/null
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.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://marte.ifsertao-pe.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">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.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>
+      
+MIIDwjCCAqoCAQAwDQYJKoZIhvcNAQEFBQAwgaYxFDASBgNVBAoTC0lGU0VSVEFP
+LVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZlQGlmc2VydGFv
+LXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1i
+dWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1
+LmJyMB4XDTEzMTIwNDEzMjExOFoXDTE2MTIwMzEzMjExOFowgaYxFDASBgNVBAoT
+C0lGU0VSVEFPLVBFMQ0wCwYDVQQLEwRER1RJMSYwJAYJKoZIhvcNAQkBFhdjYWZl
+QGlmc2VydGFvLXBlLmVkdS5icjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQI
+EwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0
+YW8tcGUuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0JDE
+PZ1eD+TXUZG+HP4FX/SfAqONECwpduJLWNaX2VSorGCmNyQfjyFil0Fce0RdxL2B
+oLc/B4EgGvm9/KCEnhK8EwhWIy9eAi34mJ6dsQnYL40afuO2NFBiGc7TeB+Lj3Hj
+Z/y5g40t50LCnwWUrqzNedUbSLtmJVXWIwn9iO0jPuHuemhTs7YiSt+qIBzBpY2g
+7AeeNkE8VQoJwUFaj5mlmtE4SU9WgURp+u7k05q9La8nIn/xfHFcuVMEzGvQcHsR
+T8lyvJMBjcVJsiJeNCD565GdRTfu3W4tlysQQBM2V/uttteCZ8BpdMQLOop0oNbh
+BPHafdSvF8bLnebtcwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwKBvF2yL3oSI9
+sqKlq1ktY18vHBT58Lc928kyVOWSQH+nDGGJsYOYXCh+zJQdq8Ow3aZA7tXQili3
+avGOhmOM5LfaRvkWCEigfw5frMj4/gRDXk0I7mONk5o5c47XxhSjHg2OiGpQQdqm
+/6MnIQMt98zXoy47mzCtkdgH3qc+hvv2biZtFExcmuZsbjun9TbaCQs1WlTX4Yr9
+ICLuROVF4HNDdN1IeVc+YjL3dIZBw294A3cg8CpSY+5qKEBJF6MgRzrDPy2vzTGP
+UeJoFHTC661va14QsI92zQQCObT42jGq0hRml0MKslZo+c7Cwet0N1xBPQmkjNbe
+DH5XzO/u
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marte.ifsertao-pe.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">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Francisco Hamilton</SurName>
+    <EmailAddress>cafe@ifsertao-pe.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz.xml b/swamid-interfederations-2.0/meta.cesnet.cz.xml
new file mode 100644
index 00000000..c2fe39a5
--- /dev/null
+++ b/swamid-interfederations-2.0/meta.cesnet.cz.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://meta.cesnet.cz/sp/shibboleth">
+  <md:Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">MetaCentrum, CESNET</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">MetaCentrum, CESNET</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for MetaCentrum, the grid department of CESNET</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro MetaCentrum, gridové oddělení CESNETu</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.metacentrum.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.metacentrum.cz/cs/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.metacentrum.cz/Shibboleth.sso/WAYF/eduid" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Active</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.glite.eu</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
+9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
+PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
+rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
+vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
+8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
+X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
+dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
+ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
+BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
+QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
+T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
+JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
+zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
+bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Standby</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
++SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
+XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Active</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.glite.eu</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEzjCCA7agAwIBAgIQUPcidFJvVTeMMovLOnvObTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDUyMjAwMDAwMFoXDTEzMDUyMTIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9LDWzd7/lkHYbK1
+9HvIrdDr4eyAIlCPmYvU/8Yy2ezxg+GXCufe+CGF/AZsBcG7HC0L4rmMjlF0qCsB
+PwqmAEenMpIfb1BVkok+7p0QIja5ZLmmsbtnU8uPauTSxY1HFG33nBj5TKc9cXk9
+rCttWQ/JJeYMsMm1ioTiUFg2wzN88mluXvtahYx6PgUA9bRLwMhpj1pBfFN2Eakc
+vX+6AynyBWzohsXd3bDD/EMt2b2dUfDzbi37UFiMIYBpwLkfhgGeaVEC871iXT7u
+8H/Mi+ancJVboa/moye8nQkcrm2Ws/ZhAkcEaFgkj1z/ECxfeKICaSxCF70ODBO2
+X4KXDQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFAdQwzTToseEzmW6GK36RLF3diFCMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIGIBgNVHREEgYAwfoISd3d3Lm1ldGFjZW50cnVtLmN6gg5tZXRhLmNlc25l
+dC5jeoIObWV0YWNlbnRydW0uY3qCEG1ldGF2by5jZXNuZXQuY3qCFW1ldGF2by5t
+ZXRhY2VudHJ1bS5jeoIRdm8ubWV0YWNlbnRydW0uY3qCDHd3dy5nbGl0ZS5ldTAN
+BgkqhkiG9w0BAQUFAAOCAQEAm2zT+PCSJz/tGwcuNN9Zs2Wydkuio/X9DbI8aruP
+QKoLP0+vxu5T/ymEkmBfywcnDIdjCcBruloc6HzAr6TEiSnA0se6813hSp+DCV0p
+T2eceKnvOjVKjNpVRvosxyIlu7tupOTEQZiGsTNU1WtTu99PsGAlMHNpgPlrGe/P
+JXjUmvgdtt5PgkUdCaHkoNSUwRdB1DwDO+tKGyY/dvUPaYFCj/EfePgPIsOmWFEv
+zDnk+mod1McmMwPFW/fxlpFiUdtsoswkodIUgnynuRzUGSkGZgGqVWFjz7LJ/dwy
+bXdlZwBweUbE7uYAM6MFWGK1aNJ+a6xZbQlNr/cW8+XKDA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>Standby</ds:KeyName>
+        <ds:KeyName>einfra.cesnet.cz</ds:KeyName>
+        <ds:KeyName>meta.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metacentrum.cz</ds:KeyName>
+        <ds:KeyName>metavo.cesnet.cz</ds:KeyName>
+        <ds:KeyName>metavo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>perun.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>vo.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>wiki.metacentrum.cz</ds:KeyName>
+        <ds:KeyName>www.metacentrum.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.metacentrum.cz,O=CESNET,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE/jCCA+agAwIBAgIQZJhKx6tjiIFmfpZnwmbegjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIwNzAwMDAwMFoXDTE1MTIwNzIzNTk1OVowOzELMAkGA1UE
+BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSd3d3Lm1ldGFjZW50cnVt
+LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+Ob1/WykMJvEau5
+B4VkUv6mmjO+yjh7YFYPQKBUhdZS9AISjX8NRPH7y0SXasCOCdi3phwlzKnWoUQq
+UuRh/inUe/DVGu44F1oai33gxKQuRCLgbxD5Uxm7M0QDm5q6XjIqkSYJU7pZtFgR
+JvosB0AdYylrPY2paWk0+BGWhWjFHB8zZywmiEMmCawjD8cLcCRTwhTzBTHDSFKQ
+5JnqHJSKazWj/l55ECVsnx2ezUT9DqaXCBjM6R4r7l5vRA2328mHpwgfOqEONboF
+s1BOPwf6pbqAEeLSDSwLBwsUguohYan5adisAPIcN9A5aGdsLWxy1bi5TH5vET+c
+js6xcwIDAQABo4ICATCCAf0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFDQ/IQ/LVEu8GUWMKwhdu7L1XoWyMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
+BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
+Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
+BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
+b3JnMIG4BgNVHREEgbAwga2CEnd3dy5tZXRhY2VudHJ1bS5jeoIQZWluZnJhLmNl
+c25ldC5jeoIObWV0YS5jZXNuZXQuY3qCDm1ldGFjZW50cnVtLmN6ghBtZXRhdm8u
+Y2VzbmV0LmN6ghVtZXRhdm8ubWV0YWNlbnRydW0uY3qCFHBlcnVuLm1ldGFjZW50
+cnVtLmN6ghF2by5tZXRhY2VudHJ1bS5jeoITd2lraS5tZXRhY2VudHJ1bS5jejAN
+BgkqhkiG9w0BAQUFAAOCAQEAHJ2gaM4WNXYhUWFb+KdRdw8kCSZsZF3AekhGd2XG
+mK6aUsbLfJcLMg0tuROkJnxMtZoeLLfPvHiCBtUPD7jvCJcNDCNlICkaEG3Grmd6
+swb1hC+ELuGTAC5om1b/1bIbbYQvCx1mk19kBugPSI47Yyb0G4RqBQLWNvAjH1gI
+WLSQJQxpF1h5oVM5OW/V0h+R3/RC7xnirr4Y5M476wwC24FdrtMeZ6F7nGsIGJdI
++SgNReiXBL/pow3YapcrTCoWJuUvq2mmpn3FQEA6ofbv6wMemIwB92cVuoo4/fU6
+XOx3BPUl5ZWVnWHxgCphyglT2/eB4+nvzj1cDTHkLHMsOQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metacentrum.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metavo.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.cesnet.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://einfra.cesnet.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.cesnet.cz/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alcor.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML2/ECP" index="12"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/POST" index="13"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.metacentrum.cz/Shibboleth.sso/SAML/Artifact" index="14"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">MetaCentrum e-Infrastructure</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">MetaCentrum user registration</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MetaCentrum, CESNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">MetaCentrum, CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">MetaCentrum, CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">MetaCentrum, CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.metacentrum.cz/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.metacentrum.cz/cs/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Kuba</md:SurName>
+    <md:EmailAddress>makub@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org.xml
new file mode 100644
index 00000000..d57fb00f
--- /dev/null
+++ b/swamid-interfederations-2.0/monitor.eduroam.org.xml
@@ -0,0 +1,46 @@
+<?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:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.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:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://monitor.eduroam.org/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/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://monitor.eduroam.org/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">eduroam supporting services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</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:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">eduroam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">eduroam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.eduroam.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dubravko</md:GivenName>
+    <md:SurName>Voncina</md:SurName>
+    <md:EmailAddress>monitor@eduroam.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu.xml b/swamid-interfederations-2.0/neugrid4you.eu.xml
new file mode 100644
index 00000000..3b9cac46
--- /dev/null
+++ b/swamid-interfederations-2.0/neugrid4you.eu.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neugrid4you.eu/saml/metadata.xml">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-12-05T14:46:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">neuGRID for you</mdui:DisplayName>
+        <mdui:Description xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">neuGRID for you</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
+CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
+CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
+MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
+QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
+NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
+3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
+MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
+OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
+sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
+P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
+SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
+b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
+XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
+6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
+avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDfTCCAmWgAwIBAgIEbaA2aTANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJGUjEVMBMGA1UE
+CBMMSGF1dGUtU2F2b2llMRAwDgYDVQQHEwdBcmdvbmF5MQ4wDAYDVQQKEwVtYWF0RzEOMAwGA1UE
+CxMFbWFhdEcxFzAVBgNVBAMTDm5ldWdyaWQ0eW91LmZyMB4XDTEzMTIwNDE0MzYyNVoXDTIzMTIw
+MjE0MzYyNVowbzELMAkGA1UEBhMCRlIxFTATBgNVBAgTDEhhdXRlLVNhdm9pZTEQMA4GA1UEBxMH
+QXJnb25heTEOMAwGA1UEChMFbWFhdEcxDjAMBgNVBAsTBW1hYXRHMRcwFQYDVQQDEw5uZXVncmlk
+NHlvdS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwvYRQpDscRzuobC7VIfUFz
+3DHejMCC3s+l49pcdzngiqHvmNdtveTjg8G2HKqjcakLZZqBGmgFUMk2419BQSGt70Lvyap2Ys8k
+MFV+MX6CveGSNYDO7q6mEoDFSYDGn3YwYIXxWEnrbLxoC1TuPeUJWkgJN5zvuPZYumu5ChqPUGkv
+OfSGFEoWn4RCgzb2Fs1sQ4kGrExA0Ht+wMjy/z55hDarvrOK9dBov8oALhWrIlYc5nNu4a6xrmDz
+sDNjQZywobKSHJXjT34Ymrqvx6oP9s9Zh4nSJiBKhvOHPLsiUTyIvzRTO11sqh4IMxQtQwIrsQ+c
+P5nt2tYlSnTxCFMCAwEAAaMhMB8wHQYDVR0OBBYEFBNhnLLuvMIhcsk4yvJRBX9vsN/bMA0GCSqG
+SIb3DQEBCwUAA4IBAQAneAmyrRTMxvH+QvS9272MMrmKZ7T5krCT1BgIKbxwEHqAqww+6We2R87t
+b8znR6Jgt8SMexYL40BzR4RHXPkr39usz6ptO1Cvdv/WuB238EoqrmGCsnSx3S5Nmbunh0pyWigh
+XM4pLVkZS9b7g59KGh8gAPRrSnb6EMfQ0qf/TcrmPCCzeWVR8uF4mL65i3cZVp0IlLeY+K8lfEVO
+6TgsEuKmzs0rNbbz715rcTJVLZVvk1dFCX1wtQX9yOSBfXt4k6f0igBvy1Tuv1CRa5Qe2FMlR5h3
+avGd92x2qmbKefJkqpTfiZeGJmKwaTqXnqnpq1IQlzyHLMpFLPerP9Kv
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="1"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">neuGRID for you</ServiceName>
+      <ServiceName xml:lang="en">neuGRID for you</ServiceName>
+      <ServiceDescription xml:lang="fr">neuGRID est un portail web dédié à la recherche scientifique dans le domaine des maladies neurodégénératives. Grâce à neuGRID (i) les neuroscientifiques auront à disposition pour leur analyses une grande quantité de données de résonances magnétiques cérébrales archivées dans l'infrastructure et (ii) les cliniciens auront la possibilité de sortir automatiquement les marqueurs des maladies neurodégénératives pour effectuer les diagnostiques des patients. NeuGRID est un portail intuitif ouvert à groupes d'utilisateurs différents, à partir des étudiants jusqu'aux neuroscientifiques les plus experts, engagés dans les domaines de la maladie d'Alzheimer, des maladies psychiatriques et des maladies de la substance blanche. NeuGRID vise à devenir une ressource amplement répandue pour l'analyse des résonances magnétiques cérébrales.</ServiceDescription>
+      <ServiceDescription xml:lang="en">neuGRID is a web portal aimed to (i) help neuroscientists do high-throughput imaging research, and (ii) provide clinical neurologists automated diagnostic imaging markers of neurodegenerative diseases for individual patient diagnosis. neuGRID’s user-friendly environment is customised to a range of users from students to senior neuroscientists working in the fields of Alzheimer’s disease, psychiatric diseases, and white matter diseases. neuGRID aims to become a widespread resource for brain imaging analyses.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>admin_france@lists.maatg.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
new file mode 100644
index 00000000..1ae7c85a
--- /dev/null
+++ b/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nrenadmin.redclara.net/simplesaml/saml2/sp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</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">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">NRENAdmin - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's NREN Administration Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Administración para RNEI de RedCLARA</mdui:Description>
+        <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+</ds:X509Certificate>
+        </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>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nrenadmin.redclara.net/simplesaml/saml2/sp/SingleLogoutService.php"/>
+    <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://nrenadmin.redclara.net/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SEG</md:GivenName>
+    <md:SurName>RedCLARA</md:SurName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
new file mode 100644
index 00000000..b73be26b
--- /dev/null
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-05T08:47:07Z">
+      <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://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
+        <mdui:Description xml:lang="de">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>twww11</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
+BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
+BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
+E7gfLARdAbSMy3ntWsCqI0M4uXkeN8vZe2aiBUGi0hN9TuN9DO8mr4P8EXjhT0qQ
+/tfff3FOJggFQwT8xXjSxevD3/fQfc31cc19W48xLzZ2299w0GlT6ABVeykixnT/
+2N4BUFwlGKKSYZ25VvF7HStpO8PoqoOU+vTxxOSHv+k8r/E+e8/Yqy1x+tYwjtCp
+mRTuej2AEg7EvCPez4+63GcSkSFJDTkAdUkIsQwBvBjceeeNjPrfDdcVriYq8zEq
+aHlAM88NOWqkzhFn7RDDQ9I40Km2sv+zEwHn+cYe8RQktx+7kTocNfttlc6Gj3cx
+wBo6gLCYlDtE9Bp4Hg0CAwEAAaM0MDIwEQYDVR0RBAowCIIGdHd3dzExMB0GA1Ud
+DgQWBBTEKetHu5XysV19YPdBXllRdGy+0jANBgkqhkiG9w0BAQUFAAOCAQEAIRi/
+IZLuNXS7kk8e6Hj4QW0eeqNBpHRHVPC/J2/2C9GpRVEPCmsYTRhIDc6y1XDEpJlW
+u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c
+M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
+6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/
+5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4
+1bxBV69YDJSB5BjVPA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">OpenSKOS | Meertens</ServiceName>
+      <ServiceName xml:lang="en">OpenSKOS | Meertens</ServiceName>
+      <ServiceDescription xml:lang="de">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</ServiceDescription>
+      <ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</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="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="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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>KNAW</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:servicedesk@knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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/papi.kfki.hu.xml b/swamid-interfederations-2.0/papi.kfki.hu.xml
new file mode 100644
index 00000000..cd1cb14f
--- /dev/null
+++ b/swamid-interfederations-2.0/papi.kfki.hu.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://papi.kfki.hu/idp/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">kfki</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mail.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunserv.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rmki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aeki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iki.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfa.kfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szfki.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wigner.mta.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">energia.mta.hu</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:IPHint>148.6.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUdn3t4i5i7MiVMJB07lC7yL4IAoowDQYJKoZIhvcNAQEFBQAwFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MB4XDTA5MDgxMDE2MDEyMloXDTI5MDgxMDE2MDEyMlowFzEVMBMGA1UEAxMMcGFwaS5rZmtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGGAG9GWNsCJZ6JayutI95u4FmGvsfza6uSKUX3XuZp1uUViY6eH4h4gCNgCzufvJ4GNSdxYhohFEgzB0MM23MrDl9DzS4NX+g7eYFCmmD1zPcui4YzIYJWmCSXAqXDqaLox4aVxtQrOr4sBcy/0jzlXXC3IHSS2GKuCj8tlXf9TLoZTZgZaNcyphelUa/y2DsmNSMIcfZXmYbZCqD/VErNBwfPD5mAr+M+1C5JxRY+6XIPs7jh2eibWZsiafsgDYV2Px2M5NoPfwaJDyBLVA57t34p2G9xCeCak+5cPgu3sZ+sdGC1OZ5uLr+32l9KUu+mR/Q/j2m06dlK4wF8rzwIDAQABo18wXTA8BgNVHREENTAzggxwYXBpLmtma2kuaHWGI2h0dHBzOi8vcGFwaS5rZmtpLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS0zg53E13omfWDQUJAKMLs2TKjgDANBgkqhkiG9w0BAQUFAAOCAQEASowJqpasNKCiw9UvgdaYs98wdI5xKFNIngJdJUKqlYIR1EgibCKFSap6dQkjkuVyMoUfd13WNcruCKHm+TYR+A77/xQB8mr07LAKhcMCYXVR3JuHLewzEbKrXhifaP9Qj5isuiLTFPpsYHtOra9HkEhpRRxM9UO0F1tBXZwV9XtTfbSk/vqQUID4MufOnlLGcfoL551wEa8lQWTcj8+alUaizeIp66M3tFIB317xM7gMtAPdkp5FOyEO25ko6DuIXXFA4vIbGhJSPNmb9GjmKF4i2LlEZpFzW8FCrHS12cVtmDBUE8rw993QIE38s8Bi64wgMQPCG9dgeIUvHKn/zw==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcDCCA1igAwIBAgIQdJ8kRHCkiTNnB2gsFl8HnDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTAwNTIzNTk1OVowTzELMAkGA1UEBhMCSFUxKTAnBgNVBAoTIE1UQSBXaWduZXIgRml6aWthaSBLdXRhdG9rb3pwb250MRUwEwYDVQQDEwxwYXBpLmtma2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2GCoP21qShohHWYORncFPElyjE3mBXCbNIDM+a0GkG0IbiD7b042iseaCxqlTioQtux2wV92DmvGolJvVYHQB4X3bR407ZSCM0KWZpcU+1IsZnQ+t2ZbgC+Hdu4S3lgr8ShWx4b8fsMLZRJDZpMv26jVDMRw3AgC6hYjHlxhEK5dq4Zf+QB39cecsI7AbMeME7VxSV9DrfunDr2gWeGH/VZZ1WxQ7pzaaPg4H/Dwy9PSGL3wcyB4JtmmoxC9V0MtD443Q+eNqTQDOVCgDMRQjPCBLP17EsEtNCAOKoixFR/BnpQIOf7d+nZnBkTZQ4qcQyda2gREyC+YPH9HVZulLAgMBAAGjggFfMIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU+K5mh3yYNEZJ1h03qgYcnzPDUXYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMcGFwaS5rZmtpLmh1MA0GCSqGSIb3DQEBBQUAA4IBAQC3UcffXrc9R6QaYjPRX1mPnFaBd//JZufTUCNjmeVU5cxV0BXy1pbyJGwrDnIEGtjazkvcF3mwaCLD2B3mGaiXKlO3S7bVfNjCaGQZVmKPlzHMWRubUihPPcDN4MEgXEd5qnRnGw+dMdFX01DK+RPuiQIbvLKrSV3lpwoAm0rIYuognbxmdIinzkU6+lrpQZt77eCvnzTMBDkg1TIFUYFoBJ42viPN7R+380D9DSmV3nh/ewZj71mT6313QdODR2sY8XQsac4OSC/wMQdSQzeQZAAWY+LeLiXUko9EYlwRUdoU5XY/oFrHpRah3uswFK8aKlyxNx0mkPp9lGI/bfOL</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>papi.kfki.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/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" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">MTA KFKI - Magyar Tudományos Akadémia Központi Fizikai Kutató Intézet</OrganizationName>
+    <OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">MTA KFKI Csillebérc</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">MTA KFKI Csillebérc</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.kfki.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.kfki.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>KFKI AAI</SurName>
+    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>KFKI AAI</SurName>
+    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>KFKI AAI</SurName>
+    <EmailAddress>mailto:aai@kfki.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
new file mode 100644
index 00000000..152c3742
--- /dev/null
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-09T11:21:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DiscoJuice" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:Description xml:lang="en">Institute for Dutch Lexicology Portal</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
+MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
+A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
+ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
+s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
+d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
+goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
+4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
+AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
+BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
+IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
+dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
+Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
+Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
+b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
+MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
+MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
+bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
+wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
+ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
+JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
+EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceName xml:lang="en">Institute for Dutch Lexicology Portal</ServiceName>
+      <ServiceDescription xml:lang="de">Institute for Dutch Lexicology Portal</ServiceDescription>
+      <ServiceDescription xml:lang="en">Institute for Dutch Lexicology Portal</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>System</GivenName>
+    <SurName>Management</SurName>
+    <EmailAddress>mailto:systeembeheer@inl.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Service</GivenName>
+    <SurName>Desk</SurName>
+    <EmailAddress>mailto:servicedesk@inl.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk.xml
new file mode 100644
index 00000000..7b9c5700
--- /dev/null
+++ b/swamid-interfederations-2.0/qub.ac.uk.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qub.ac.uk/shibboleth">
+  <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>
+    </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">qub.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
+						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
+						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib3.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3.qub.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qub.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhCgAwIBAgIVAJycK9QeBfR7eEXzFTRCeXgxyljUMA0GCSqGSIb3DQEB
+						BQUAMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azAeFw0xMjAzMjcxMzE4NTha
+						Fw0zMjAzMjcxNDE4NThaMBoxGDAWBgNVBAMTD3NoaWIzLnF1Yi5hYy51azCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIreX13KY2pe43eXfxccSvl/4f3N
+						QD5HtQfUY7tjkMyT+og8bDiavnHm5puyoO8hsIOOV0Hqv4nrF8cKhu895IcnstWY
+						sd9vLjSRhSKXa8w3VcRhpWDMLaxd21jgi/32tofMCWodFx38cGyuINI2Wuv2ME05
+						r03JMVnwWmjFCzGWsdUTHSffi0GlW6bo1X/3jzx+5VMkKRobbLzCvMSzTmyCFEn8
+						rZQhhFtShz3JZAajnOsRLiiJmYi2ep70Ub3aE8ZB3HOizWYsgPulmMTUm3nacr50
+						x9P+tWxKdtd4qU/m4v9wYsRJhJpA6yljZmtrQMsoKMdpgKkHhd1WGdwQt1MCAwEA
+						AaNlMGMwQgYDVR0RBDswOYIPc2hpYjMucXViLmFjLnVrhiZodHRwczovL3NoaWIz
+						LnF1Yi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXmiIagkYVllQI5LM
+						BnzS+VAh5EAwDQYJKoZIhvcNAQEFBQADggEBADuA54YASAFyW/RVKg44Aktj/bGe
+						aYcuOfGcv48TNIOeS/NHRqlQeyjiyvPGlc8ul3mMYv8Q9MoB7DxpCJa7BbbXSVQC
+						n5jkx70rmbc7WOrSH5uNjQP34rbRMK56yOGdlUEAKf4V3raGWHOs5V+Q4n9gE4FG
+						bHqn90pt5kR9L7VZW8D1dPpMA3YDbDj2anX0zM8VQxiqipUWeoISWX0P6cEhQzsz
+						j5jG9uXwrdLwsmzHImL6Xc4K41lVaxXoZydYzmu6nougbKa+XdIRiRLqJDeId6ZA
+						iEW6gm81phqOuQXOIMVz4Qbd0M3RhcskYsYaZW08gG/vBOLNZEyqmtph6/0=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3.qub.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">The Queen's University of Belfast</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Queen's University Belfast</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.qub.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Karen</GivenName>
+    <SurName>Murphy</SurName>
+    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Karen</GivenName>
+    <SurName>Murphy</SurName>
+    <EmailAddress>mailto:k.l.murphy@qub.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
new file mode 100644
index 00000000..42229862
--- /dev/null
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://quod.lib.umich.edu/shibboleth-sp/acls">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-18T16:12:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ACLS Humanities E-Book</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ACLS Humanities E-Book is a digital collection of over 3,300 full-text, cross-searchable books in the humanities.</mdui:Description>
+        <mdui:Logo height="74" width="872">https://quod.lib.umich.edu/a/acls/graphics/aclsheader_new.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
+						PLcvWTRfLv+JNqoT2yM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEijCCA3KgAwIBAgIJAIT48jHMZ0+hMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
+						VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjEf
+						MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBNaWNoaWdhbjEnMCUGA1UECxMeTGlicmFy
+						eSBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRswGQYDVQQDExJxdW9kLmxpYi51bWlj
+						aC5lZHUxKDAmBgkqhkiG9w0BCQEWGWxpdC1jcy1zeXNhZG1pbkB1bWljaC5lZHUw
+						HhcNMDkwODA3MTUyODU0WhcNMTkwODA1MTUyODU0WjCBxTELMAkGA1UEBhMCVVMx
+						ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxHzAdBgNVBAoT
+						FlVuaXZlcnNpdHkgb2YgTWljaGlnYW4xJzAlBgNVBAsTHkxpYnJhcnkgSW5mb3Jt
+						YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMScXVvZC5saWIudW1pY2guZWR1MSgw
+						JgYJKoZIhvcNAQkBFhlsaXQtY3Mtc3lzYWRtaW5AdW1pY2guZWR1MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtw76D6i/mIoKdM0RKwvl4j5DN7POIScx
+						hTDtXslnmEzd7Lzfl8q8NVgoFDJ7U6ciRA3ajKe26wlJO/E0F4iZPQiJvcl1T6lT
+						wKOp4lK4xGFBScYsaLJnI1WzjiTHJt8QpMqpuHpfFSzqozhS9rYADBKwVPANi9qr
+						FplIQr/d/h3R48H/9fHcEDV8GFucH5kLw5EkLOmIAu++skkRAG6Wvajj498drE0e
+						CHDGa7O2l3S7HYlLiQH+KnRk9Fv/kwWsqVAk7E/48oa3UuOdJM01/PNVSAEKBg2w
+						i2S0YP5sZqBuCP43RzHarEFHNawmu8kcb51aXFagOq6xlbaisTMjUQIDAQABo3sw
+						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
+						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjqnAa9SKCm5M1p4CTERZW+ouqEkwHwYDVR0j
+						BBgwFoAUjqnAa9SKCm5M1p4CTERZW+ouqEkwDQYJKoZIhvcNAQEFBQADggEBAKjc
+						MNz0L7eP9Ck1v07Q239cbH31S/KxWaiQP/gbHw7knNZhhNywCs5F/V+/zI/xaPUu
+						gtWOiQborOuysBa7lGdrQkKqP5r8j5Tq8HtM5XhIf0r8BIZg1wX8k92CBI8JR7IY
+						k4qcrrSDrImNB2EEnTTMAWWc8VTKW8+D5z1ygDXQsB2Gxf/ywk4xQ9r+AChBCwt9
+						319gyt4k8RIkhvErotahf2MFzZrzM7GrEdNZhjfyprI8GilTC3MC7tep5wHyvRQ5
+						6+M7kXd3PupQ48lKtXY2BvZqmHJ2XVAcLanoJobr4fBEGBT29i2sE/Uqs9N1DTz5
+						PLcvWTRfLv+JNqoT2yM=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://quod.lib.umich.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">University of Michigan: ACLS Humanities E-Book</ServiceName>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Michigan</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Michigan: ACLS Humanities E-Book</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://humanitiesebook.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>University of Michigan Library IT</GivenName>
+    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>University of Michigan Library IT</GivenName>
+    <EmailAddress>mailto:lit-cs-sysadmin@umich.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
new file mode 100644
index 00000000..c0faf6e1
--- /dev/null
+++ b/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ra-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ra-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - RA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.ru.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
new file mode 100644
index 00000000..fbef3e5f
--- /dev/null
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repos.ids-mannheim.de/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
+      <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://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Respository</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
+        <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIHFSoBfvFYgTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
+A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMzAxMzExNDQ3MTFaFw0x
+ODAxMzAxNDQ3MTFaMIGGMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3Vl
+cnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEnMCUGA1UEChMeSW5zdGl0dXQg
+ZnVlciBEZXV0c2NoZSBTcHJhY2hlMR4wHAYDVQQDExVyZXBvcy5pZHMtbWFubmhl
+aW0uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCef4ups838DAB9
+AFeOl3+K4nADphpeElH6iRY41C+o9dOQ+m5N9Twmpp7K0EjZGObwvmESRry07pL6
+72mO0pTV7lTiE9USv3CIRMxCplv4bzaCphv2veXFYKUXU/nuo8CT5i6y6GLS/k7q
+0mTVIxOk12thQLcV3mRfvY88OP4yGeWDMmo/Nvefaha3TxrNt5iIilZ9UWstnPSp
+u3pV3uX+l8gUNVRHAretThJyyj2bBNJwxZ2P16nzQZL68hrJOBf4wruJOp743/c+
+X3lKLtapFo/XHfwylwC+V1FIHFKvgVNdAv28d0rtwoQcEJXfHlaHiPTyu+YQMRmn
+MpUcInV3AgMBAAGjggJOMIICSjA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQD
+ADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+ESD/k/Bc7kTRJc0rsugmsX+uy+EwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvx
+vCJ1beswIAYDVR0RBBkwF4IVcmVwb3MuaWRzLW1hbm5oZWltLmRlMIGRBgNVHR8E
+gYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
+Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3wYI
+KwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2
+aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AJjBPxcfPIjEor07OUrgzTSup6qh4auvTaQzmLj/Q7N5lA2oLElqIm8kmmW+630f
+BK0p0LeExeOmpNI5rIR34qY6sIA99hdYYMwGrxEnNqPIo7PEfrY0naSIHp8nykJk
+n3zsRY/eskpYdUKhbYLdm23mcp9aitQ2cHp4Li+X599Jwew/epXKpkPs+X5n7Vl6
+WDdN1kceolQ/2UKi/eO4P7DoEh5R5EPZCJzCnekVCaAUgz8zXrbdJp9Ctzk03rgH
+b1xeN6QBnOlltEeOTtUV2b/KADXu1eNF41dVN2ofSWAn1zx321gHv/fb0hEhTbUE
+hoWgvpRdJLO3MqO0sMEedQE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Institut für Deutsche Sprache (IDS) - Forschungsprimärdatenrepository</ServiceName>
+      <ServiceName xml:lang="en">Institute for the German Language (IDS) - Respository</ServiceName>
+      <ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</ServiceDescription>
+      <ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <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="administrative">
+    <GivenName>Andreas</GivenName>
+    <SurName>Witt</SurName>
+    <EmailAddress>mailto:witt@ids-mannheim.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Oliver</GivenName>
+    <SurName>Schonefeld</SurName>
+    <EmailAddress>mailto:schonefeld@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/ricevi.ct.infn.it.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
new file mode 100644
index 00000000..cd9489c2
--- /dev/null
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T11:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
+        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
+        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
+        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
+        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
+        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
+        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
+        <ds:KeyName>www.chain-project.eu</ds:KeyName>
+        <ds:KeyName>www.special-project.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
+                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
+                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
+                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
+                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
+                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
+                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
+                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
+                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
+                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
+                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
+                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
+                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
+                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
+                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
+                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
+                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
+                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
+                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
+                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
+                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
+                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
+                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
+                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
+                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RICeVI portal provided by INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">RICeVI portal erogato da INFN Catania</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Riccardo</md:GivenName>
+    <md:SurName>Rotondo</md:SurName>
+    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Giuseppe</md:GivenName>
+    <md:SurName>Platania</md:SurName>
+    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Carlo</md:GivenName>
+    <md:SurName>Rocca</md:SurName>
+    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
new file mode 100644
index 00000000..744522bc
--- /dev/null
+++ b/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rja-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rja-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - RJA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.rgsl.edu.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
new file mode 100644
index 00000000..8a86f7c0
--- /dev/null
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://rnp-cafe.ifs.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFS - Instituto Federal Sergipe</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifs.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifs.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
+c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
+hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
+VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
+LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
+VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
+T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
+QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
+E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
+grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
+G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
+6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
+0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
+3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
+DZqccZQCmzfE8nJworc=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDyjCCArICAQAwDQYJKoZIhvcNAQEFBQAwgaoxKDAmBgNVBAoTH0lGUyAtIElu
+c3RpdHV0byBGZWRlcmFsIFNlcmdpcGUxDjAMBgNVBAsTBUNPSU1SMR8wHQYJKoZI
+hvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMRAwDgYDVQQHEwdBcmFjYWp1MRAwDgYD
+VQQIEwdTZXJnaXBlMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTcm5wLWNhZmUuaWZz
+LmVkdS5icjAeFw0xNDAxMzExMzM5MDFaFw0xNzAxMzAxMzM5MDFaMIGqMSgwJgYD
+VQQKEx9JRlMgLSBJbnN0aXR1dG8gRmVkZXJhbCBTZXJnaXBlMQ4wDAYDVQQLEwVD
+T0lNUjEfMB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEQMA4GA1UEBxMH
+QXJhY2FqdTEQMA4GA1UECBMHU2VyZ2lwZTELMAkGA1UEBhMCQlIxHDAaBgNVBAMT
+E3JucC1jYWZlLmlmcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
+zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
+OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
+8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
+2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
+D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC4G
+grZK2At9gtsq9XUPYVvIHCKFoROkJfU3VwT+9O0uWz5cu2ycPgjefCTp6zfTjiX7
+G6uGvuJcO/lteK9M6mSS1ti0G2g1IuzQo+6IOYVJgEkwgF1BPLrVAnmAca9WKWhI
+6GgCqbRx1MktZRAEdHiH5//UEkjxqcTUgLV4JZYpVOVkGnz5TakajKoLb3bAvrhH
+0OXmdk6/gaF9jp1ypII8Yfm1PBlhBGXj9tK0AT+6DnMyHDqFxdNw0dAKudol3jep
+3niJmc8qhqspMxB7iVGGiIRp3ybPl+GVo6NPWPhZ30dTjKkbttHoy5iuVQo2n/Jr
+DZqccZQCmzfE8nJworc=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFS - Instituto Federal Sergipe</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifs.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifs.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Joao Silvio</SurName>
+    <EmailAddress>coimr@ifs.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ross.impa.br.xml b/swamid-interfederations-2.0/ross.impa.br.xml
new file mode 100644
index 00000000..a25190fc
--- /dev/null
+++ b/swamid-interfederations-2.0/ross.impa.br.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://ross.impa.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">impa.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.impa.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.impa.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
+DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
+OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
+HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
+Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
+mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
+zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
+NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
+vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
+JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
+ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
+BQbIol8hjh2qNA/n
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.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">impa.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
+VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
+DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
+A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
+OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
+HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
+Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
+mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
+W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
+zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
+NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
+vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
+JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
+ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
+BQbIol8hjh2qNA/n
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.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">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IMPA - Associac Instituto Nacional de Matemaca Pura e Aplicada</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.impa.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.impa.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Ricardo Gomes</SurName>
+    <EmailAddress>netadm@impa.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi.xml
index ef0b9a6a..402c28ca 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
         <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
         <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
@@ -48,104 +54,135 @@ rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
 PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kari</md:GivenName>
-    <md:SurName>Laalo</md:SurName>
-    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJveT6FhGnRaNxedpR2vBR8wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAyMjgwMDAwMDBaFw0xNzAyMjcyMzU5NTlaMDkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
+ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/o15npvL9zJkZMSbo
++WbjYZFt5Kh1Q2RnpJSlTI5xzDBll6eTHt39o1N917p3JsK01PGRlU7XNkrjs3C2
+Fv5UnovxFBcqcID46Xt7/lxYscwa8nPRaIMeSbWQmkI7Q/EHFVhs4iNH+aorea2l
+9lA/cYL5BiJcCJVfx1fsjOwFKQvGVWygpXHeHf0g51FI8srBoTWsjk9X7efqh2/P
+aahiK4hxndsN9AI7uYuZMwGn2LgJBgtygcAwfjSetIUP3FW35tUgrFCMkl2VWDpk
+yGloOGBTAvrfxvLWSiFjyRisKMzr5II2teouuYryDchiElfAvTGzCH4fibpls5Lk
+6Fr/AgMBAAGjggGOMIIBijAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQUcWWdao/gfmMmsM30W3mJp1o/C1AwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMDwGA1UdEQQ1MDOCC3JyLmZ1bmV0LmZpghBoYWthLXJyLmZ1
+bmV0LmZpghJoYWthLXJyMDEuZnVuZXQuZmkwDQYJKoZIhvcNAQEFBQADggEBALVa
+OfF1Y0uE1rkEkc/Y5czqaS0bEUnLWeGXLamyRdYzKuVItKZIyu+HRZB+k6c0VE2y
+590ZESH5ILjna/q6/dDjsoaptSfdONB5gf25siD4CnBtQNOLtMwcYF2BL40qyZE9
+wFhk1hWgnRzg72Pm53Kej3xDFSLgpm/7hfhR5zg+bDN9AgbJm6G0XZQC3WgIpB4q
+8JVW+7CfqSsZYPKQgrBlv32ybuQ6DPfZoe/Ipbu//1sJWpeGoE/WGqm5tWUlBYgf
+/HlrR7HHKsJq3JWslY6VAMZ1FufeZ6MfMgCWe6AHVyD2kLoBoJQVbr+jaYkuy/Z2
+q+P9YePYTP340BAMAo4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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
new file mode 100644
index 00000000..349b2cdb
--- /dev/null
+++ b/swamid-interfederations-2.0/rtrvirshib.ifmt.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://rtrvirshib.ifmt.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifmt.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifmt.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifmt.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    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=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifmt.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+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=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Diretoria de Gestao da Tecnologia da Informacao</SurName>
+    <EmailAddress>dgti@ifmt.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
new file mode 100644
index 00000000..be159ba6
--- /dev/null
+++ b/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml-1.sys.kth.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska Högskolan (KTH)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
+        <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kth.se</mdui:DomainHint>
+        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
+        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
+        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
+        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
+        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
+        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
+        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
+        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
+        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
+OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
+XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
+YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
+C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
+H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
+4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
+L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
+0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
+if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
+Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
+oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
+JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
+jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
+sdhdXg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-1.sys.kth.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-1.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kth.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVALx4XVtH3sOyM28YH834f5bbuHNlMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNhbWwtMS5zeXMua3RoLnNlMB4XDTEwMTExNzE1NTYz
+OFoXDTMwMTExNzE1NTYzOFowHDEaMBgGA1UEAxMRc2FtbC0xLnN5cy5rdGguc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDxtJdcAOVTCIq6UQlCpqm
+XbagnXzhINClFn/+XS3+KH0mb5HnLLugIQ12hH0SFfD7KgVh3mRwBZsbs0Q8QJoZ
+YkOfTii/I5Buvw6l4N36m58VLZGv2W0fFAQLMk2IeRqHd32wGyaVro0DojCKj+Wi
+C7pyHkMRQdofNNgS5tV6/Ls/FJUhK4P45u2MYQwGZR00u84ngQaQ+uw1xEoLGbpt
+H1Ic0ZqGH/7E6EhRs82taWCHUBy/qbFNuTsXKzRDQDAvnKvtosrpBfFqZ3wvJdIW
+4Q63jUFk9d84+h5xWe1rJD46MXUti55PYWPzzweIeXUE0vpPnlCWt2C5BzOFqeCt
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMS5zeXMua3RoLnNlhihodHRwczov
+L3NhbWwtMS5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSHF1tH
+0Si0nenf53KeBzfw0JFKMTANBgkqhkiG9w0BAQUFAAOCAQEAfMDHG/jm+HsQo2t6
+if67Cs0iX2d0kridHeHE02BzAUTKSFQ0ywA+jXlJRmYnRXQqnl8qh1V4Qw6PmHKJ
+Im5rjNRUA72a9Vo42QBPXVy8UJOxTHMQhK6aFG0UXTofo5lzroz39YqaNGo6k5zx
+oBDagUCJ+Mfu4tOQ+j2ZbP1syTgCroX0XsRsdU/KXEdmPtQBAdEgWB0siCI31sOc
+JWNDZOy2Zm1yPdryCtJD56IwYEXRi9ACLDUYteoqypxq+Cjp4gkJNe+fsvyCjuCf
+jLJfoU/KdGJJcfuMirPEC2mfSdMWK3XDCvaxKU9Or2ZV6FjitQDPt9V2n/qNe5mu
+sdhdXg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-1.sys.kth.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">KTH</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Kungliga Tekniska Högskolan</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>KTH Royal Institute of Technology</Company>
+    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>KTH Royal Institute of Technology</Company>
+    <SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
+    <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+    <TelephoneNumber>+46 8 790 6000</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>KTH Royal Institute of Technology</Company>
+    <SurName>KTH IT-Support</SurName>
+    <EmailAddress>it-support@kth.se</EmailAddress>
+    <TelephoneNumber>+46 8 790 6600</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org.xml b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
new file mode 100644
index 00000000..85fc870f
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T09:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
+                        Africa Grid Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        Africa Grid Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
+        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
+        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
+        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
+        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
+        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
+        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
+        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
+        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+                            j/MCNlE=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+                </md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Fargetta</md:SurName>
+    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Roberto</md:GivenName>
+    <md:SurName>Barbera</md:SurName>
+    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
+    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it.xml b/swamid-interfederations-2.0/sgw.garr.it.xml
new file mode 100644
index 00000000..617e8dc0
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.garr.it.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-11T00:45:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
+                    </mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
+                    </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sg-liferay.garr.it</ds:KeyName>
+        <ds:KeyName>sgw.garr.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sg-liferay.garr.it,OU=Domain Control Validated,DC=tcs,DC=terena,DC=org</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE6DCCA9CgAwIBAgIQDb4u4turk6L4quPPEEv+kjANBgkqhkiG9w0BAQUFADA/
+                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEg
+                            ZVNjaWVuY2UgU1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE1MDExMjIzNTk1OVow
+                            gYIxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmEx
+                            EzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZh
+                            bGlkYXRlZDEbMBkGA1UEAxMSc2ctbGlmZXJheS5nYXJyLml0MIIBIjANBgkqhkiG
+                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyBpspPbjl5JERSur4StdxTTFFaObxEY/opI9
+                            17VRD4KmiPcPfbSUYEfgI4h1e6fSylMwg2sVws1uISJm9mYrzFivRX62N92ALgfS
+                            nUn8/YOryuRaGUi2VWD2k93uP0wwY+4uOj0my0KWKI5maZ22pTyzjTmq+vmm9IQL
+                            T1e4SInE/p1KQQYdmdeQ1IHu/M0yxOuo6evQ6o4x6asDFXYiAc8n/KJbZmwj7y9b
+                            3pVH3Ra5v8dmvlEaii17T7UdyKL4y+70Wntm6gU4vAaGwVn9r7V9hbbIPbK8jndO
+                            fjlXa5ze2naHKqTcIpWAYx787G333EviWMlMZwUB+GaEN4R76wIDAQABo4IBmjCC
+                            AZYwHwYDVR0jBBgwFoAUI9OXvcDYoZRhiA2Ftsx1n8l5O5IwHQYDVR0OBBYEFDrj
+                            WiJIiSmHLfoC++tXo3MW9s0iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+                            MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAwBgNVHSAEKTAnMA0GCysG
+                            AQQBsjEBAgIdMAwGCiqGSIb3TAUCAgEwCAYGZ4EMAQIBMEIGA1UdHwQ7MDkwN6A1
+                            oDOGMWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xD
+                            QS5jcmwwdQYIKwYBBQUHAQEEaTBnMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRj
+                            cy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+                            hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAqBgNVHREEIzAhghJzZy1saWZl
+                            cmF5LmdhcnIuaXSCC3Nndy5nYXJyLml0MA0GCSqGSIb3DQEBBQUAA4IBAQBfUy8v
+                            GupDJmcDTmNSx5kse8NfmSB1kbwM96IE7Eap+/VgNiIeOwjAyfK2gafLfD4QCYao
+                            1WQvBPqoqY3h14Wsbl5SRRRS+G6oj4x51YVvm7D6kgh4E5wlqfMPbDsZtGnkfh/m
+                            ZsTEL1Ixz6dT6PSzsqu5tPa9RnwNtBL+rRCW7OUfs6MPxofNmu+GCry8/6gZy2Rd
+                            yxyH2bHQkbZCMSil/2cvX/3ib2mg+eYrlZQywmRtWL92UtJoKlt96K1RYUKXdfIq
+                            Pm6o7CRIyLzXCIKWimG/PIPiJ0GNH1K2+X54yM/tV+bsjBCHlQe8RpUVKxzm5dtG
+                            zkkOSinydr85B7LG
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
+      <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
+      <md:ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
+    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <EmailAddress>sgwadmin@garr.it</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
new file mode 100644
index 00000000..add66844
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp-1.oru.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
+        <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>oru.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
+NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
+D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
+z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
+a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
+NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
+pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
+L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
+5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
+O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
+ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
+x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
+SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
+JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
+Pz8R3A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVALJU7HH8NWybHvd6JV9KLneiEBQ9MA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWItaWRwLTEub3J1LnNlMB4XDTA5MTAyNjEwMjU1
+NVoXDTI5MTAyNjA5MjU1NVowHDEaMBgGA1UEAxMRc2hpYi1pZHAtMS5vcnUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7J4bgJcpbTuu4SD8pYvDC
+D5lRoaxVTvvacSPEIt2FUTGfa+smWLJvaoxL7eaP517Re9xqqw0MyRZ2fjyDW2GU
+z84RhCMQemT6EccDCEDwubkjoq41QQFbOsk/uh40Q0a/fOniP+e9cDpq57vQTux6
+a1tFNHgbOVR/1PsCksVsY6tdVbR364otqKXIti8ddYmPB5ax5Qr4+ezD7MJwitvN
+NyOgZZ2qM8P7Y1rMN+kKb4OTPHLIhVUiCRtww3p/9HTZOhjxRZbDKNLVQjHCwv9N
+pKh+cON1k5YGSEYba28z1ZuKKvVq6cCMcgndTiMA0R8LxMi3psbWB6rohddoo8E9
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWItaWRwLTEub3J1LnNlhihodHRwczov
+L3NoaWItaWRwLTEub3J1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSJG9Hv
+5hKDK9iBmJYEU3Hg0DZZPzANBgkqhkiG9w0BAQUFAAOCAQEAC1tgenssXaACi4b0
+O+j5Qno3bjq35y+cj0OC/Za2lBuD10zYiySOMcuxg7WdPDiiTKtoBdYkRRN6oKiT
+ix3hLTwuU3PjLTIZ83ytNgezEa6oK+iCGi/ecz2ax77QZ9rqpQCRNudIZjbTN6SO
+x+FduJkHovXk0Z9zfp5YZzJG2ViPYemurS8OEofkJXQKgmoFmw+LycSTMx2G6rnN
+SqQVF5wbEc9N1wy/sisZQ8yw4Err6mDAChcnrGtfFQ5aR89Xrb2VIkaOTRysytEQ
+JCVUOimhAjCyTt7bIWWH3Y1VYBQ9PfklNyHfusJ3AjqnuqYjoDiDKEz42EqLnq71
+Pz8R3A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">ORU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Örebro Universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen</SurName>
+    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Örebro University</Company>
+    <SurName>Jonny Ehrnberg</SurName>
+    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303851</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen Örebro universitet</SurName>
+    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
+  </ContactPerson>
+</md: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
new file mode 100644
index 00000000..23f86149
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-10-21T09:44:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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">hu-berlin.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Humboldt-Universität zu Berlin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Humboldt-Universität zu Berlin</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Humboldt-Universität zu Berlin</mdui:Description>
+        <mdui:Description xml:lang="en">IdP der Humboldt-Universität zu Berlin</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.hu-berlin.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.hu-berlin.de/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+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==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.cms.hu-berlin.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">hu-berlin.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+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==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.cms.hu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.cms.hu-berlin.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">e233</OrganizationName>
+    <OrganizationName xml:lang="en">e233</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.hu-berlin.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.hu-berlin.de/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Petra</GivenName>
+    <SurName>Berg</SurName>
+    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Petra</GivenName>
+    <SurName>Berg</SurName>
+    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Petra</GivenName>
+    <SurName>Berg</SurName>
+    <EmailAddress>mailto:shibadmin@hu-berlin.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
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
new file mode 100644
index 00000000..e2963802
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
@@ -0,0 +1,91 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
+						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
+						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
+						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
+						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
+						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
+						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
+						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
+						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
+						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
+						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
+						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
+						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
+						ZgojzE1jEQkVmYzQirlmP/kiz1k5
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDETCCAfmgAwIBAgIJAPGWoIhDomdwMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+						BAMTC3NoaWItc3AtZGV2MB4XDTEwMTEwNTA0MTY1MVoXDTMwMTAzMTA0MTY1MVow
+						FjEUMBIGA1UEAxMLc2hpYi1zcC1kZXYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+						ggEKAoIBAQDPvKQqQDjZxRKqICIU8CfnT+wU1zRJIHgP9fbiebqVEpklkUwXnlQK
+						+Bif5oNaHAKq3etAp/QzP9/HffBCTHrRubdXPjzzhsqDCLvLMZ4xFk/omgjl36/N
+						1ruDUapMB2T0xUGS2Gev1olYbfL0MjRnhQqasJOvdqswI/U9eU8xYXLnz1dqeOPs
+						Ury21Zop4fVL9KY6sAvFDg6TrdgY7h5f8RJbIkjA3R3E0M+TR/dZiOvIw4CIjKFU
+						qUcIX4F+c0BGvSJU4RaunAG9RyNTGZvm9LBptiVcLGNXMyb0+KxIpwFQdd9juOpp
+						OXHjzkqxwQ87BZ+lCPMH5I4UhqBfNNJDAgMBAAGjYjBgMD8GA1UdEQQ4MDaCC3No
+						aWItc3AtZGV2hidodHRwczovL3NoaWItc3AtZGV2LmNmLmFjLnVrL3NoaWJib2xl
+						dGgwHQYDVR0OBBYEFAiqFmapO7egaR+j3lXoc8yFYs6oMA0GCSqGSIb3DQEBBQUA
+						A4IBAQATLXYR4ia9D/oDtOBHmfxwRHLcrDZqUdYD2NmJc3R7VQoV+SiGeHCxqZ65
+						wF5wWEDWByWjk/LQmOM/vov8UzlLD6GlyVlyo/yLfvNrsDbh83Ohc4TSLKXGar1x
+						2IzA6DP5OwA0FdJ5mZt6F+Mx9f/bo/yQf4yh219Gkuy/2MBtlTDelkSALTuoiaiq
+						9VuAp1o2yJr3ttEa3oyZUQyMi0TbnfVd8rfEkGefvGvjmWdDSRT1ZoojRIfZh+tV
+						w4NpiARsEdi/nWgud1MV7GTScg9YtZcaCahDoVeXVSTao4+NxBKXjlalGieMLlzC
+						ZgojzE1jEQkVmYzQirlmP/kiz1k5
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-dev.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Cardiff University Test SP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Rhys</GivenName>
+    <SurName>Smith</SurName>
+    <EmailAddress>mailto:smith@cardiff.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it.xml b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
new file mode 100644
index 00000000..c4d9b76c
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices than supports Wi-Fi</mdui:Description>
+        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots/it/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
+        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+                            BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+                            MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+                            GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+                            oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+                            dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+                            lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+                            OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+                            AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+                            czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+                            gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+                            5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+                            Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+                            NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+                            fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
+                            P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
+                            xEb0XXxzdH8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
+        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+                            BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+                            MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+                            GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+                            oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+                            dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+                            lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+                            OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+                            AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+                            czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+                            gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+                            5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+                            Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+                            NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+                            fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
+                            P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
+                            xEb0XXxzdH8=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
+      <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>triestefreespots@comune.trieste.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
new file mode 100644
index 00000000..e77601ad
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib.ifgoiano.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">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFGOIANO - Instituto Federal Goiano</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifgoiano.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifgoiano.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.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>
+      
+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==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.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">IFGOIANO - Instituto Federal Goiano</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifgoiano.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifgoiano.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Frederico Pereira da Cunha</SurName>
+    <EmailAddress>frederico.pereira@ifgoiano.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
new file mode 100644
index 00000000..4a14e4df
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.manchester.ac.uk/shibboleth">
+  <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>
+    </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">manchester.ac.uk</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Manchester</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://login.manchester.ac.uk/disco/logo-16x16-m.png</mdui:Logo>
+        <mdui:Logo height="34" width="80">https://login.manchester.ac.uk/disco/logo-80x34-ltd.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>130.88.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>manchester.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>man.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mimas.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mib.ac.uk</mdui:DomainHint>
+        <mdui:DomainHint>mbs-worldwide.ac.uk</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.465624,-2.233193</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.474881,-2.233593</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.236237,-2.306421</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.480372,-2.24893</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.572576,-1.315923</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.462436,-2.227711</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.429749,-2.230049</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.445089,-2.278115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.490592,-2.28839</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.487545,-2.323424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:53.427332,-2.247825</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:46.23145,6.050119</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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://shib.manchester.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.manchester.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.manchester.ac.uk/shibboleth-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">manchester.ac.uk</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEdzCCA1+gAwIBAgIQaXCywgq+vX5DO7vX+v+c6TANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDUzMDAwMDAwMFoXDTE2MDUyOTIzNTk1OVowQzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliLm1hbmNo
+						ZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7mNMx
+						lCtJ3uEbR9KNxl4wxdpRof4DyoKCu/FfByvIDfr9zB5H2P8mGQfOD0o49xiEkFCd
+						lozVa8f8a3yNjY3pHgibEIMXSJ1QalP+CrINr/a32O8WYV9ZA2w3rkSggtWxxmVD
+						HHQ9ufTl2lmvkGg1Z0+3VCic5mEEDHDKXKm4CWo5CGnT8/FzTD2sJfGdSsfi1WDK
+						k6Gff+hv9VZCjWzSJgXtuLgYP5Ze9ZcDgcKuqlwlpOzOO6NEMI8dzfHMp+yTL+4B
+						JaahF0zPuOsfJFdi6/r5GsmVLtJXiQuPstRPVTwb9mQuhOmDC4zYcPfjA49yjqnC
+						reJTACJv6Z42rmtRAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+						ays3V0fqkOO57TAdBgNVHQ4EFgQUNwr+LyyfLnzNIYq172tNWGDX2tIwDgYDVR0P
+						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFXNoaWIubWFuY2hlc3Rl
+						ci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAcL1bk4E3a2N2C+va00jBDRb4BF69
+						PfSqKZkXeeUHOpGUU0l30p8iS2uR7F+t3CYHulqN3jqPbtpNHUbtUdBpbIY/KTGW
+						nm2fF8hW84RwmGhR2w7B+f3He5gleC7t7Tj91L+z7ue8YvbYxiLjIZfiEmon0iUT
+						7d2BkbiIL7TVA3W63EIHnQHT4xNLzv1pvWCXU275R2k54qFyoYdmhC9sljPQWZ1v
+						G7+O+Vm74LsAsHXnCQ0qkxarXF8aCLkHqhhLLUm4EgzRTeYbh9E6WFaQlDbQvRp8
+						VwcrfdTH7WKGAJFWbvlQd/HKb8NJOkQOh+bJoHAn71W3DUoZU+DZYjiuIA==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.manchester.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.manchester.ac.uk:8443/shibboleth-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">The University of Manchester</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Manchester</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>IT Service Desk</GivenName>
+    <EmailAddress>mailto:IT-Servicedesk@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Sam</GivenName>
+    <SurName>Jones</SurName>
+    <EmailAddress>mailto:sam.jones@manchester.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ufg.br.xml b/swamid-interfederations-2.0/shib.ufg.br.xml
new file mode 100644
index 00000000..5b9af2c7
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ufg.br.xml
@@ -0,0 +1,108 @@
+<?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://shib.ufg.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">ufg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFG - Universidade Federal de Goias</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFG - Universidade Federal de Goias</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFG - Universidade Federal de Goias</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
+A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
+NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
+hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
+MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
+FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
+tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
+YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
+qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
+qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
+k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
+4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
+3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
+f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
+JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.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">ufg.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
+A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
+YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
+MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
+NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
+hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
+MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
+FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
+tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
+YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
+qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
+qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
+k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
+4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
+3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
+f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
+JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.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">UFG - Universidade Federal de Goias</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufg.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufg.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Douglas Borges de Oliveira Filho</SurName>
+    <EmailAddress>douglasfilho@cercomp.ufg.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se.xml b/swamid-interfederations-2.0/shibb1.hj.se.xml
new file mode 100644
index 00000000..5d087664
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb1.hj.se.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb1.hj.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Högskolan i Jönköping</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Jönköping University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Jönköping.</mdui:Description>
+        <mdui:Description xml:lang="en">The Jönköping University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://hj.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://hj.se/en.html</mdui:InformationURL>
+        <mdui:Logo height="77" width="299" xml:lang="sv">https://hj.se/webdav/images/system/gfx/logotype/hj-sv.png</mdui:Logo>
+        <mdui:Logo height="77" width="277" xml:lang="en">https://hj.se/webdav/images/system/gfx/logotype/hj-en.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hj.se</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:57.7783,14.1633</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
+MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
+f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
+FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
+Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
+sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
+gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
+BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
+hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
+ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
+fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
+6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
+Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
+nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hj.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUB7TrKFw9b8VuoROWwTsp8hJE5oowDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMB4XDTA5MTAxMzA3MjcyNVoXDTI5
+MTAxMzA3MjcyNVowFzEVMBMGA1UEAxMMc2hpYmIxLmhqLnNlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk5R5pnnBvG4o7SW4uekwfFNvAvGSAGUf9lOu
+f7ui6bIi2J0j4mIJXbeVdGsUbXCFUKwoJB9AfBfQm/9V3Szwxk5qHoTOFOH0Y0MS
+FCimnTUv4j2lIeab980784pyfDD2dBgMzsWmFra8JXg6Y66Ag3TXTYQOX1Bodr6W
+Lff27tYfoEiUqfL1WRE3KeH2EzVaTf53zHrMwlbAifB+jhdA7AIJw9gGpMuUpzB4
+sPR5tD/M/SUJPIz37YyGbmpI3pqGoabpvZ8bBWut4Z1EnUFtd7fIwt5UMbFc4i5/
+gUL3jKpDHO7mKfZq8BstcWkgzZ1x0HHRWZFFzfowQytvHea3ewIDAQABo18wXTA8
+BgNVHREENTAzggxzaGliYjEuaGouc2WGI2h0dHBzOi8vc2hpYmIxLmhqLnNlL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2nNJVvFq4dsSheCENArwBFmDmCzANBgkq
+hkiG9w0BAQUFAAOCAQEAEg326B4J0RirwToLWX/dAa5nTC2mkbzpbVnTTb06mFLp
+ZEo7uIRiucdqAFhQKN6zo0GdxRnTq+9SClFxLhiuJlG7AhnoQEVe63cyVdNcmQNs
+fkeZrOpWJvTz8tWBmhmhwgMmvUgSsJE9VGBgthyoU0W46y6sQv8/fkGz4d6ThXL1
+6BXs5VYnwyXH0q5N98XvDTOEz4u892/jdWIXVsgxipFMcnAI+Kq81w0n1leqthoK
+Fk3SN7U4Ui90TIxZGaNG/HIZTPwJWcbk/m9gLl+N8d1NYqzy4u4lnNYnZWca6WZ8
+nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">HJ</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Jönköping University</Company>
+    <SurName>Joakim Danielsson</SurName>
+    <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101116</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Jönköping University</Company>
+    <SurName>Stefan Kindh</SurName>
+    <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101170</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Jönköping University</Company>
+    <SurName>IT-Helpdesk</SurName>
+    <EmailAddress>helpdesk@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101112</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz.xml b/swamid-interfederations-2.0/shibbo.tul.cz.xml
new file mode 100644
index 00000000..fa9d57d1
--- /dev/null
+++ b/swamid-interfederations-2.0/shibbo.tul.cz.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo.tul.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">tul.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Technical University of Liberec</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Technická univerzita v Liberci</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Technical University of Liberec.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Technickou univerzitu v Liberci.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.tul.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.tul.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://liane.tul.cz/img/znak-tul.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>
+                        MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+                        NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                        IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+                        BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+                        MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+                        MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+                        SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+                        7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+                        pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+                        b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+                        c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+                        FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+                        sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+                        CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+                        A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+                        U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+                        dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+                        dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+                        Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+                        +C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+                        9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+                        dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+                        vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+                        zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+                   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.tul.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.tul.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">tul.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+			MIIEcjCCA1qgAwIBAgIRAPfZ5zaSWEpw8Vc1xSSxyNgwDQYJKoZIhvcNAQEFBQAw
+			NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+			IFNTTCBDQTAeFw0xMjExMTMwMDAwMDBaFw0xNTExMTMyMzU5NTlaME8xCzAJBgNV
+			BAYTAkNaMSgwJgYDVQQKEx9UZWNobmljYWwgVW5pdmVyc2l0eSBvZiBMaWJlcmVj
+			MRYwFAYDVQQDEw1zaGliYm8udHVsLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+			MIIBCgKCAQEArstKIJXSamcd4N0fzyZ0ViFYVCJBZZU3QKmQ25NZq6Cfrw8kH75E
+			SioySW1H4kSzTKLze7qTOLmVYpZyq68emuK+d2vf2wm9TPLYbjC+LVJKrPiRtRHF
+			7cCi2k5ONwENq7jnIvpq0Z+V30sC0/WfXESnjsB51/PklOa04YMwpUQDqQHsWl/8
+			pG9fQ5G9OtzWUiYYHPbyNe3zZa1O9uUKpATKNuwtx49+b/VdNKW2voHieVG0beyE
+			b59FR/Io4gVRevLxo2B/tkBaa8SmuTfCwyqSkkv59sywUObnN3KYmVUb8Fpmbx4X
+			c1BJHi2wC6IqbTxWKS+e4FkqW3Snc0xNNwIDAQABo4IBYDCCAVwwHwYDVR0jBBgw
+			FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNxZp6dM+6sOb4hhs74b
+			sMtnL5OTMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+			CCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoG
+			A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+			U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
+			dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
+			dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDXNoaWJiby50dWwu
+			Y3owDQYJKoZIhvcNAQEFBQADggEBAKfiwyXiInmGSgBMFTEGwFsaE0opLkvDEiSp
+			+C4namIgpNTRIb7rsp1R+C8NgQaykoQTNdMgUJO94lF8VESOdfoYjkEYZi9KWs1U
+			9+wtdJxx0FY2NKhx2mgvF/FgTbNdUEEqW+5byWxTLXycTYe5ZIgbHgRcOupU9NKs
+			dfl8zJKwqtOjOIm2fKE3Z8xULMvw8D6rV7dWuVFios3P4sBfkt0S5uK15mlX5lDI
+			vZBzEWQ1L9C1GELPPMS56JYfObgJxGzcNZu+s6lXOINBoROYT/5p2mhI5xWeZWJZ
+			zOSaicB9fW0hVsTwGJDw4hwESk9eLj3tlpyvWSYXvbf1Y06t8rw=
+		   </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.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:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Technical University of Liberec</OrganizationName>
+    <OrganizationName xml:lang="cs">Technická univerzita v Liberci</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Technical University of Liberec</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Technická univerzita v Liberci</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.tul.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.tul.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Adamec</SurName>
+    <EmailAddress>Petr.Adamec@tul.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>David</GivenName>
+    <SurName>Kmoch</SurName>
+    <EmailAddress>David.Kmoch@tul.cz</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
new file mode 100644
index 00000000..f4fcca3a
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
@@ -0,0 +1,117 @@
+<?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-idp.dti.ufv.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">ufv.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFV - universidade Federal de Vicosa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFV - universidade Federal de Vicosa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
+X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
+9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
+EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
+b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
+TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
+mnRgIPsxKrrKvirQ
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.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-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.ufv.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">ufv.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEKDCCAxACAQAwDQYJKoZIhvcNAQEFBQAwgdkxLTArBgNVBAoTJFVGViAtIFVu
+aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UECxMrRFRJIC0gRGly
+ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
+ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
+ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
+dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
+BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
+CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
+MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
+VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
+ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
+8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
+RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
+aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
+YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
+WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
+X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
+9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
+EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
+b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
+TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
+mnRgIPsxKrrKvirQ
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.dti.ufv.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">UFV - Universidade Federal de Vicosa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFV - universidade Federal de Vicosa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufv.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufv.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Harley Balduino Saraiva</SurName>
+    <EmailAddress>harley.saraiva@ufv.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
new file mode 100644
index 00000000..2604e5a6
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.gwdg.de/gwdg/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-01-16T13:09:19Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Wir bieten als Hochschulrechenzentrum für die Georg-August-Universität Göttingen und als Rechen- und IT-Kompetenzzentrum für die Max-Planck-Gesellschaft ein breites Spektrum an Informations- und Kommunikationsleistungen für die Wissenschaft.</mdui:Description>
+        <mdui:Description xml:lang="en">We offer as a university computer center of the Georg-August-University of Göttingen and as computing and IT competence center for the Max Planck Society, a wide range of information and communication services to science.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.gwdg.de/fileadmin/images/favicon.ico</mdui:Logo>
+        <mdui:Logo height="72" width="240">https://www.gwdg.de/fileadmin/images/neu/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://gwdg.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://gwdg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.gwdg.de/index.php?id=impressum</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
+ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
+FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
+QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
+i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
+0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
+gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
+LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
+c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
+shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
+eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
+rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
+mNIjImyl26Rs6RqKxw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">gwdg.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.gwdg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
+RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
+IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
+IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
+ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
+RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
+bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
+MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
+FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
+QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
+i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
+0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
+gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
+OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
+MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
+MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
+aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
+NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
+bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
+dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
+AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
+LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
+LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
+c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
+shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
+eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
+rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
+mNIjImyl26Rs6RqKxw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
new file mode 100644
index 00000000..fbc58af7
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.mpg.de/mpg/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26: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>
+  </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">mpg.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">MPG (GWDG MetaDir)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MPG (GWDG MetaDir)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHFsFJy21RkjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMzEyMDYx
+MzA4MTJaFw0xODEyMDUxMzA4MTJaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA1r20ptuqe2akE1HNiefNATNZipgA+LMijPqXD2JqxFiO8W5bfQMjQHf0S0v2
+bF9xEGFn7BtuGXR2knfzQoycf5ErOFToUoyf/Pkvqq4dJZzYoIQT/crbnJMm/Sy0
+P/HA8LQMgLV5DjQu7hq79/A7746mqYg0zZm7gCwq+Wbrb5RSBJRlZNFU7c52dDSj
+IjtGjgnD9YA1RbHoqdaguYYSnW4RR8Wh8lAaH8S6n6jsb7MeP7SyfGmw64ZY3vWm
+uDwtfQK1p4wcTOITl1U//Oi5AAqrPA+8T++GooYe9rmIElue/yQdw1ctKWdOVIM/
+zec+pVgLKxcijoqD/14vXgfzLwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFIEaXWTZBwnYrv8u0yR97TeHM3QwMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAG7ohBHYkMb6MSXK2ipMslPTjKF2B7eA
+htIGAVONLIVlz2W50848jj25XpKeCa/rA7l0k+fmMF5UU8LFaswUmRSWmPNDZe2p
+NigWu7hPXU4HlcBxLH6qdyl+nq0KJ+vyKLY2CrA+ULykUjzRYjgcBEa0zehuO4ZC
+X0Md8xW9Qh3eyW3JDkqnBt/yDbJiPPt85gdoZpf6IpQo9gDa4KTQoBSinj/wpu5d
+AM8+OjeD6EllQ2DG9pPflbAvWCvCGjYFefEIOIxj5kVAwNr+hjKmhrvIhcgCRPxC
+lm98qSFLxbEARoZiQPMKYdTVeEcNiiWdrIe7A0QILNiu+LaQCbKHyoM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.mpg.de/mpg/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/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">mpg.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHFsFJy21RkjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMzEyMDYx
+MzA4MTJaFw0xODEyMDUxMzA4MTJaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA1r20ptuqe2akE1HNiefNATNZipgA+LMijPqXD2JqxFiO8W5bfQMjQHf0S0v2
+bF9xEGFn7BtuGXR2knfzQoycf5ErOFToUoyf/Pkvqq4dJZzYoIQT/crbnJMm/Sy0
+P/HA8LQMgLV5DjQu7hq79/A7746mqYg0zZm7gCwq+Wbrb5RSBJRlZNFU7c52dDSj
+IjtGjgnD9YA1RbHoqdaguYYSnW4RR8Wh8lAaH8S6n6jsb7MeP7SyfGmw64ZY3vWm
+uDwtfQK1p4wcTOITl1U//Oi5AAqrPA+8T++GooYe9rmIElue/yQdw1ctKWdOVIM/
+zec+pVgLKxcijoqD/14vXgfzLwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFIEaXWTZBwnYrv8u0yR97TeHM3QwMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAG7ohBHYkMb6MSXK2ipMslPTjKF2B7eA
+htIGAVONLIVlz2W50848jj25XpKeCa/rA7l0k+fmMF5UU8LFaswUmRSWmPNDZe2p
+NigWu7hPXU4HlcBxLH6qdyl+nq0KJ+vyKLY2CrA+ULykUjzRYjgcBEa0zehuO4ZC
+X0Md8xW9Qh3eyW3JDkqnBt/yDbJiPPt85gdoZpf6IpQo9gDa4KTQoBSinj/wpu5d
+AM8+OjeD6EllQ2DG9pPflbAvWCvCGjYFefEIOIxj5kVAwNr+hjKmhrvIhcgCRPxC
+lm98qSFLxbEARoZiQPMKYdTVeEcNiiWdrIe7A0QILNiu+LaQCbKHyoM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e71</OrganizationName>
+    <OrganizationName xml:lang="en">e71</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.biochem.mpg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.biochem.mpg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml
new file mode 100644
index 00000000..0b60efea
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml
@@ -0,0 +1,120 @@
+<?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-idp.pucrs.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">pucrs.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.pucrs.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.pucrs.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
+IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
+ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
+YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
+ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
+ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
+b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
+M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
+IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
+R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
+aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
+BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
+A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
+V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
+nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
++16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
+aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
+eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
+UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
+5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
+4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
+1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
+3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.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">pucrs.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
+IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
+ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
+YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
+ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
+ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
+b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
+M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
+IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
+R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
+aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
+BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
+A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
+V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
+nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
++16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
+aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
+eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
+UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
+5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
+4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
+1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
+3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.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">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.pucrs.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Dilermando Bueno</SurName>
+    <EmailAddress>dbueno@pucrs.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
new file mode 100644
index 00000000..0d11db03
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-goettingen.de/uni/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-14T07:54:13Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Georg-August Universität Göttingen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Georg-August University Göttingen</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Georg-August Universität Göttingen</mdui:Description>
+        <mdui:Description xml:lang="en">Georg-August University Göttingen</mdui:Description>
+        <mdui:Logo height="16" width="19">https://www.uni-goettingen.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="98" width="126">https://www.uni-goettingen.de/img/logo_druck.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-goettingen.de/de/1.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-goettingen.de/en/1.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.uni-goettingen.de/de/439479.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni-goettingen.de/en/439479.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHFsFJ1dRdXDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMzEyMDYxMzA4MjJaFw0xODEyMDUx
+MzA4MjJaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBZ
+1OPMNEPXK3m+Fo/FSCLwFY3yO0z270+cVVBR5fUKo1ILjp8ld4nlE9BT0TMBfhTw
+7nROt+pAwQXLe9ZRqbh47buHIocQg9PgyJJG1yonKA6Ky5k0KdLVZCE35VIBMpQS
+gylMz+tpilb+NwhZyQTyWvZpRmOu6u7EDRjitGIH13RED5EBhHoG6LKFFmERO0Lg
+MgyaRHg47tVqTgSUiWBgkWdwtqVH6j4Gup1AGchqpBgUyQHuh+g523JzhLm4cSa2
+7X30lp78F9sNe/5Gb5GVf0on5JVT2YP7PrZzNY8RvADa6O4bb9MtTe74DLZc+rJ9
+1HE4a7eSW/2NWgK35PcCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBTt87wJCJ0tW5+z5pFNPtvUYBI9VDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABsYOw/YjA5Qjy9q/hQKd7PH2
+rBUOOm8nXgYQtpiaT/7TNh7BlzTdsOB0JG7PDDbCNRXF86wQbAxOIeOMyXqftshe
+DqIRf+Xb60hvaIaYqAMxh8kdxu/8gE+/TF9H6CkE0LfYSu4+kL6Dyhnd7w+VOrER
+qY8OEpZ4JVvTqpHlOru3Tdfv9pz4KSRYTYZGwbWNV1iWVq9BKFAkSP/Q/iLW/i/k
+WFJTijAznidb48+PMeD8Tv5/du0BxZ3Uj6R7U1kPYWCedfe8oCSKDleEdl8sZOiD
+ZqKg90b07Xm5lz6+K4FLbuFWY4y2/J74aWn+e9ZcMs7K3fKl80fS4db7wOldgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-goettingen.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHFsFJ1dRdXDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMzEyMDYxMzA4MjJaFw0xODEyMDUx
+MzA4MjJaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
+Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBZ
+1OPMNEPXK3m+Fo/FSCLwFY3yO0z270+cVVBR5fUKo1ILjp8ld4nlE9BT0TMBfhTw
+7nROt+pAwQXLe9ZRqbh47buHIocQg9PgyJJG1yonKA6Ky5k0KdLVZCE35VIBMpQS
+gylMz+tpilb+NwhZyQTyWvZpRmOu6u7EDRjitGIH13RED5EBhHoG6LKFFmERO0Lg
+MgyaRHg47tVqTgSUiWBgkWdwtqVH6j4Gup1AGchqpBgUyQHuh+g523JzhLm4cSa2
+7X30lp78F9sNe/5Gb5GVf0on5JVT2YP7PrZzNY8RvADa6O4bb9MtTe74DLZc+rJ9
+1HE4a7eSW/2NWgK35PcCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
+rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
+A1UdDgQWBBTt87wJCJ0tW5+z5pFNPtvUYBI9VDAfBgNVHSMEGDAWgBQdvXPMbe5u
+HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
+dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
+YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
+CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
+U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
+aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABsYOw/YjA5Qjy9q/hQKd7PH2
+rBUOOm8nXgYQtpiaT/7TNh7BlzTdsOB0JG7PDDbCNRXF86wQbAxOIeOMyXqftshe
+DqIRf+Xb60hvaIaYqAMxh8kdxu/8gE+/TF9H6CkE0LfYSu4+kL6Dyhnd7w+VOrER
+qY8OEpZ4JVvTqpHlOru3Tdfv9pz4KSRYTYZGwbWNV1iWVq9BKFAkSP/Q/iLW/i/k
+WFJTijAznidb48+PMeD8Tv5/du0BxZ3Uj6R7U1kPYWCedfe8oCSKDleEdl8sZOiD
+ZqKg90b07Xm5lz6+K4FLbuFWY4y2/J74aWn+e9ZcMs7K3fKl80fS4db7wOldgQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e281</OrganizationName>
+    <OrganizationName xml:lang="en">e281</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Georg-August-Universität Göttingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Georg-August-Universität Göttingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-goettingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-goettingen.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:dadler1@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:cpohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
new file mode 100644
index 00000000..acc8dee3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-04-16T15:12:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">ENS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="en">ENS de Lyon</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">ENS de Lyon</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">ENS de Lyon</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </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>
+					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
+w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
+9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
+UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
+WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
+3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
+jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
+9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
+Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
+o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
+kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
+Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
+0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
+rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
+NA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-lyon.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEkjCCA3qgAwIBAgIQGRyVaSVPM2LHhUv3k7YEPjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMTAwMDAwMFoXDTE2MDMzMTIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzaGliYm9sZXRo
+LmVucy1seW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypO2
+f6+uJhiZJuaWf1UR+oXBgxm+DnE5Os2ZdvPGiQnD2lWGj4UEAfh/EZzW0iNHY1KW
+tfNh9/2XHu/Et02238FkIvUymO6LOwWP9UDuCHQ4Wy7JvKa3lLYxnvh8Gal+NfEP
+I/U/DHx630t+8EimYAFZgcenWpbqkT9xjLChptj9qR5T3NbrD2hOBHwSm2G1F1D+
+p11116eELjJjePpiqOk3oL/NYtR9JiyM/5fEpfHIWEvBIfVXO5u2+cbFLttc//ZS
+WbTQGeRIfaJzPizv1jLVzwvGgl+FQr50tPleghThr/mJ3OxYwxjkh/RK6/awr0+z
+3ugq4lRl1Y06z0bJYQIDAQABo4IBjDCCAYgwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFJ7Argu6V5TSZhZ5LVnljAZDb4KxMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVu
+cy1seW9uLmZyghdzaGliYm9sZXRoMi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUF
+AAOCAQEAF4crvTXRVC0lUVCOrGvozi2C2B+R/m0tiJUGXw1C32550RW2dM/q9hio
+Bld7tdjr2g6on8L2Sc46fjlBBC9fI0r2i1rukZ1ERlEmDNhvyrIaxHCG02jfNGij
+oCanvWoBa+NAyh4BHHuBenlOrqeXZjfw1RZPOrCtZ6JnPVRuoXqpl+gt+raM4ey1
+bQt3dofx0M7vegUNzfuOJcUEBTik/WBAXuuu1i9QIeIcIPzTYCzFPs7T2tZDRU7z
+y6ERbMGTdksmIgsjjeVA9sAKxWeNXtg7OcpgcfUdIEqTGsbw3Xf7UbHr/xAEEuHW
+3rKoIY8FKvLhu0jcNpr+QzAZX6s2yw==
+					    </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>
+					      MIIErTCCA5WgAwIBAgIQAc1kf8uRsFb9YRhj0YQqJDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDMzMTAwMDAwMFoXDTEzMDMzMDIzNTk1OVowaTELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBExZT04xKjAoBgNVBAoMIUVjb2xlIE5vcm1hbGUgU3Vw
+w6lyaWV1cmUgZGUgTHlvbjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5lbnMtbHlvbi5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKenkDAt0aFrCHDigqfe
+9zDCD+c5VFDvhbYPy0c5jKhLutpo49R3uevQGTC48JIqfDr/IVLSAM+BM0KuEovL
+UqLZZuW45RzlR+YGPW+R3fEpE9MmGZz7rltu2vXfxI1AZzqvhhPXCdi2RlEjEwxJ
+WymfgA8mrlyUp1VQtfgehz+LgRzleFaLcr2ww+WCc7dMxvDU5UfF+SHytfhD/BO6
+3FyT/3e3vnE/AKIMe+y1QMLUo0Cue5O4JU1IJCKd4PDpBTu4b6m/l5HC/70Hn2nq
+jrTWYxsveAMWPzak5SKTo/G7fbxAv+WRYevbYlG+WapfX5KZKyciUyN9i8VExa7f
+9pMCAwEAAaOCAYIwggF+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBRTG1iE/xCeq/67td3H7iphPqf+9TAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYD
+VR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
+Y3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRh
+MF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5B
+U1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9y
+ZzA6BgNVHREEMzAxghZzaGliYm9sZXRoLmVucy1seW9uLmZyghdzaGliYm9sZXRo
+Mi5lbnMtbHlvbi5mcjANBgkqhkiG9w0BAQUFAAOCAQEAEtXgiiMCGQYfpPMbvytv
+o+cBxF7dHcT61DzS3/imZullXG+G8mZnqe1TNmsZBtHGz+e47bGom36aUKr37wb9
+kg7IMpveQaCyPaLPAihxCVGbdhe9n5tWeLO0dele784H1aLMiuGaKyBdOe9rXIRe
+Mgk6C5960tO3GzQa8tW5g5XaWrej2rTTEqRXozsF5yHlYuCobK4XtOdFV9M3Kesg
+0dAqsxZPP+iVUAFIjRmeJ6ZToAUO+RqrMBtwPYHz94DO8mcQwpBnPKdtvaQ0G8HQ
+rt9C3/DEh4crgo2UidNYNF9GUEwE0pqVNFIDAGfDBJGpX7aHN28jcPyRufZUiszz
+NA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Ecole Normale Supérieure de Lyon</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Lyon</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Hugo Etievant</SurName>
+    <EmailAddress>hugo.etievant@ens-lyon.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Sébastien Mei</SurName>
+    <EmailAddress>Sebastien.Mei@ens-lyon.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
new file mode 100644
index 00000000..f456acf5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fhwn.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2013-12-06T12:40:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20131015</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="de">FH Wiener Neustadt</mdui:DisplayName>
+        <mdui:Logo height="85" width="125">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://moodle2.fhwn.ac.at/bilder/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>2001:628:2270::/48</mdui:IPHint>
+        <mdui:DomainHint>fhwn.ac.at</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
+I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
+BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
+aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SLO"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fhwn.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fhwn.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHduLmFjLmF0MB4XDTEzMTExMzA4
+MjkxMVoXDTMzMTExMzA4MjkxMVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5maHdu
+LmFjLmF0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoS8CXF8y8Lcd
+J1bWqWqpcxqK07ajkBtZQ5E7Fo4pOaXx54R4eOQZR72VMLTf7Qg8W8UYopD1A1/h
+cd8u5Un/yFHDuy34pG/rPTc0rvmHEeZ5nEkDNzvKbebX78bizbZ7cThwFf8WADiV
+UAC9gxpxLAiVhqEPjytIJOnoC9ENNBqqKOaBme3KgifRW/18vEes1DANSNMP1LZi
+MLZCMLouKgwVzBpR7MGiDFx3+Xdn/g1210TpXyW4yr4FZyNxJOmuZPY8GGQBoI15
+NmWKp5Wgh1EcuMK/X0rOm7QZuuHMAUd6awXTE71MljXlPmlfDylcLWBx2QHG8Yrq
+WClEBAefeQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmZod24uYWMu
+YXSGLGh0dHBzOi8vc2hpYmJvbGV0aC5maHduLmFjLmF0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRju/KxvciXjf6JW/P+nVPegBlUsTANBgkqhkiG9w0BAQUFAAOC
+AQEATpk3i0dOltmwiHTi2NwkXPVnQh6Wtk70ZJle/2Vwl6IJGU5AcruKL9ySROKO
+z69XGJlr/CJsuZcwee/rdeGkQEaNKLjL6PgGqmxWz85LRz5rbBFAFujLj5yBSEXA
+HSLH5mhf+hL6n8uwEYcGk/0WBkWYSjuNld+4XbbyCrr12WreHk7PnZxdmSzR2gQy
+I67i0vpE9NwTTnO7ZfRVvlAtC7jYv5aC3BdS89q7R68F24h2AHbXkvrWkg+DWnjw
+BIVIp1IblZQxAYs2OF5CCTkJyWmteql3RucKtC1zWuPY1heiT+2+ac44TwkIvInI
+aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fhwn.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">FH Wiener Neustadt für Wirtschaft und Technik GesmbH</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Applied Sciences Wiener Neustadt for Business and Engineering Ltd., Austria</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">FH Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.fhwn.ac.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.fhwn.ac.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Zentraler</md:GivenName>
+    <md:SurName>Service-Desk</md:SurName>
+    <md:EmailAddress>mailto:support@fhwn.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
new file mode 100644
index 00000000..1a3ee5fc
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mzk.cz/simplesaml/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">mzk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
+        <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
new file mode 100644
index 00000000..0f51176c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.nkp.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">nkp.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:Description xml:lang="en">Identity provider for employees the National Library of the Czech Republic</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity provider pro zaměstnance Národní knihovnu České republiky</mdui:Description>
+        <mdui:DisplayName xml:lang="en">The National Library of the Czech Republic</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní knihovna České republiky</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.en.nkp.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.nkp.cz/</mdui:InformationURL>
+        <mdui:Logo height="472" width="500">https://www2.eduid.cz/idp-loga/nkp.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>
+MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
+BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
+Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
+lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
+rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
+K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
+ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
+b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
+ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
+MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
+y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
+AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
+djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
+xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
+6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
+sSo3OKOyCBTf
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.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">nkp.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhTCCA22gAwIBAgIRAPEPRVT7rSQP6fkTB6zdejAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMzAwMDAwMDBaFw0xNjAxMzAyMzU5NTlaMF4xCzAJBgNV
+BAYTAkNaMTMwMQYDVQQKEypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3pl
+Y2ggUmVwdWJsaWMxGjAYBgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863
+lHNc2GIdZPHjjqjZLEuRY80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJe
+rWKkDhx2NkGOVAvhVpikk8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQ
+K0Cv6nHhmv1gb1q/KOgNpFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5Zo
+ehK3Qr8GMkF36bL8yXxezRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4
+b1C3sfkX8iGjolxgQEm8YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB
+ZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
+FBXpVcpKQRux0SxErHIOSwZzsq16MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
+CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
+BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
+JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBwGA1UdEQQV
+MBOCEXNoaWJib2xldGgubmtwLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCJokHGcY4h
+y9JK4CIPAHM/y0dwMHMMkkq/VOt9Uefw3AUjFY88J5C7y8fP5CcL9mjF3ju6BgCc
+AWheiYFqdoyp6+A8Vj2bTLw01buM7vR+Tf0uGifsA2mwM+GhBfFfWyQtP/seRsbm
+djnx/F1oz/xk1IpzldKYSHaBKgyU/U0q3Ow5wlGlbvTJ6YOcbruT16Abppt50cte
+xmdVCMK5UEKKXtyyAnpzRiyMtk9ZZWc43aoG9u8g6QnQAvL13eUZCckfkhw20QIo
+6Np3O+ShRrAGEZ1+BEKuslKeFR7s24CAMvHYCmZM1d1l28D/tQ2qUOvshwSFaLye
+sSo3OKOyCBTf
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">The National Library of the Czech Republic</OrganizationName>
+    <OrganizationName xml:lang="cs">Národní knihovna České republiky</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.en.nkp.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.nkp.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Petřík</SurName>
+    <EmailAddress>ivan.petrik@nkp.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml
new file mode 100644
index 00000000..24762193
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.reitoria.unesp.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">unesp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNESP - Univ Estadual Paulista</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNESP - Univ Estadual Paulista</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNESP - Univ Estadual Paulista</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unesp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unesp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
+BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
+WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
+bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
+Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
+Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
+AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
+ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
+kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
+mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
+KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
+jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
+HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
+RnwM1gukVruuY/989uMLdw==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.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">unesp.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UEBhMCQlIxJTAjBgNV
+BAMTHHNoaWJib2xldGgucmVpdG9yaWEudW5lc3AuYnIwHhcNMTIxMjEyMTcxOTU4
+WhcNMTUxMjEyMTcxOTU4WjA0MQswCQYDVQQGEwJCUjElMCMGA1UEAxMcc2hpYmJv
+bGV0aC5yZWl0b3JpYS51bmVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2bIvFwo6pJnzMsR0+Pl3pZbux
+Gur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYUuPMnu8Kwn/DtUeNGvSLgQ+k3
+Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8deHpH7fsL/m9ONsUNtoVrmabHA
+AR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwpVpDg+yyCdoBfu/AANYqu2a6g
+ahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjnE9/Wam33SID6yKXYA5EIoS9H
+kgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+g2sJmqBNctEPp6EJUOoSUmh5YtsceUfijawWod/96uyNCH2i4DRAmwdrnzndqydn
+mq4lDmZKvSx3o344ciEpQvGzFS6xCUv6PWuB1VkNg8pkNh+z9iVs9Nw/kMhhsuFL
+KvTghGHEMAwB1QNTLy3j/5wEHhlIraYPhU4/j5n59V/1gXcCKF2+zOJtFcUdglfT
+jU2sFACtrH4ArVNIa9GmxGF3uX2I+Kx1YVAehqNj138hozBi4jroEyxwNzSZio7G
+HN95D4pUaaZibMzS41kSxI+tN2N/iUX+lgvB4SSjbtSuQzniq+BsumzHKy4yUpXH
+RnwM1gukVruuY/989uMLdw==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.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">UNESP - Univ Estadual Paulista</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unesp.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unesp.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Carlos Coletti</SurName>
+    <EmailAddress>grc@unesp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
new file mode 100644
index 00000000..2c5f1baf
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.techlib.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
+        <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
+X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
+cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
+mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.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">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
+X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
+cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
+mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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">National Library of Technology</OrganizationName>
+    <OrganizationName xml:lang="cs">Narodni technicka knihovna</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">National Library of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.techlib.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ondrej</GivenName>
+    <SurName>Koch</SurName>
+    <EmailAddress>ondrej.koch@techlib.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it.xml b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
new file mode 100644
index 00000000..4349f7c5
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Studies of Florence</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idem@unifi.it.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.utb.cz.xml b/swamid-interfederations-2.0/shibboleth.utb.cz.xml
new file mode 100644
index 00000000..1a5a2236
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.utb.cz.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.utb.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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">utb.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Tomas Bata University in Zlín</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Tomas Bata University in Zlín</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Tomáše Bati ve Zlíně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</mdui:InformationURL>
+        <mdui:Logo height="20" width="150" xml:lang="cs">https://shibboleth.utb.cz/idp/images/logo_cs_150x20.png</mdui:Logo>
+        <mdui:Logo height="20" width="150" xml:lang="en">https://shibboleth.utb.cz/idp/images/logo_en_150x20.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>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+e72PuA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utb.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utb.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">utb.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAPR52o0qmfjhfAJboYmgUpU/SqjDMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNoaWJib2xldGgudXRiLmN6MB4XDTExMTEwMzEyMjk0
+N1oXDTMxMTEwMzEyMjk0N1owHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dGIuY3ow
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFRk1W6FPOnadCPc4c7A2l
+KQCxuFDyLR8N0xl5zO3tpTZigrINz67uhtiBuKf9rjGggMpis6UeciCE3/AkPIVX
+k7qfj/UiLmcTjYZIsTDI5mcSTRpaq5vYJdz0X2CisSikn25wg3cUbKUdBNWT8T0b
+LrhAUO4ggx9A9tA0vtwg6a2bIUFoGFcbL/Id2isGMzz2rbUxHv++QJTxPNzXwL4A
+wLooYQs4lAUryfnjtoQxfnvi5HqrKs5e1+fv3IvTCLobBwfkXlQLeW6lSxFcPG9O
+nwByQ850LKah0Or8gQu2qrVFQzYv3GI8qXyMlqy9A/7d07O5Uv7szM1qjyVZh/ZN
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJib2xldGgudXRiLmN6hihodHRwczov
+L3NoaWJib2xldGgudXRiLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTmmhOV
+wIQYpPgGpS7cKCtioshLgjANBgkqhkiG9w0BAQUFAAOCAQEAAMCQLFF/BWMlT1BV
+/GfVdWCg7oY7FR7VHJ3fH1FTKZvnrBcYy9TRu/D+TLqnpJCTn+7c3J3g7LgsTYC9
+R/wn2qxF0UpAmn932EDWWUPUshS8hA1M5Zro4yjR9qW7l4i063AE2DMrjcartZPk
+IpiDh7CMu+xJnggrA/8aComkgfBp+kCz2xQO86tw+wKzx37lm1WyPZuqlIzpJlhJ
+IFlWgY0cksTWiNm1xra51au80h26ax/qoIO7VdYFZ1MHWOqOio57l2Nv14znaYPZ
+1Jh1bXQr/aq8Yjx95a7JoiiHOjXNS4PdSsMUUUxHALhpen2ceJrLSfFbSnqS7k3u
+e72PuA==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Tomas Bata University in Zlín</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Tomas Bata University in Zlín</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Masár</SurName>
+    <EmailAddress>imasar@k.utb.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ondřej</GivenName>
+    <SurName>Fabián</SurName>
+    <EmailAddress>fabian@k.utb.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
new file mode 100644
index 00000000..8e1e777c
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufms.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufms.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
+MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+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=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.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">ufms.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIEDDCCAvQCAQAwDQYJKoZIhvcNAQEFBQAwgcsxODA2BgNVBAoTL1VuaXZlcnNp
+ZGFkZSBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvIGRvIFN1bC9VRk1TMQwwCgYDVQQL
+EwNOVEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGUubnRpQHVmbXMuYnIxFTATBgNV
+BAcTDENhbXBvIEdyYW5kZTEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMQsw
+CQYDVQQGEwJCUjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5icjAeFw0xNDAy
+MTExMTE5MDVaFw0xNzAyMTAxMTE5MDVaMIHLMTgwNgYDVQQKEy9Vbml2ZXJzaWRh
+ZGUgRmVkZXJhbCBkZSBNYXRvIEdyb3NzbyBkbyBTdWwvVUZNUzEMMAoGA1UECxMD
+TlRJMSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlLm50aUB1Zm1zLmJyMRUwEwYDVQQH
+EwxDYW1wbyBHcmFuZGUxGzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDELMAkG
+A1UEBhMCQlIxHDAaBgNVBAMTE3NoaWJib2xldGgyLnVmbXMuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4/qfltMXAD1oXEDGUlbOVwwm4Yd7R4bgh
+i+ZU4OlPPPwzeTMe1dnCDypxxw93/5z6tj3iaYakMf/XVPh4GelknjH0nPiQL/Nb
+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=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.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">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufms.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufms.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Ronaldo Alves Ferreira</SurName>
+    <EmailAddress>raf@dct.ufms.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
new file mode 100644
index 00000000..4ced22cd
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Padova</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>supporto.sso@unipd.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br.xml b/swamid-interfederations-2.0/siaiap08.univali.br.xml
new file mode 100644
index 00000000..f1f3e57c
--- /dev/null
+++ b/swamid-interfederations-2.0/siaiap08.univali.br.xml
@@ -0,0 +1,106 @@
+<?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://siaiap08.univali.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">univali.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.univali.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.univali.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.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">univali.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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==
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.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">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.univali.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.univali.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Marcio Luiz Ota</SurName>
+    <EmailAddress>admin@univali.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sistemas.uepg.br.xml b/swamid-interfederations-2.0/sistemas.uepg.br.xml
new file mode 100644
index 00000000..3ffe26c5
--- /dev/null
+++ b/swamid-interfederations-2.0/sistemas.uepg.br.xml
@@ -0,0 +1,122 @@
+<?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://sistemas.uepg.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">uepg.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.uepg.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.uepg.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
+CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
+b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
+b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
+GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
+VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
+SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
+NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
+aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
+0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
+FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
+hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
+Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
+oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
+LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
+LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
+aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
+c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
+pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
+gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
+sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
+n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.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">uepg.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIIE2zCCA8OgAwIBAgIQCOU7rX76FeJ9Ci35yhOEPDANBgkqhkiG9w0BAQsFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEzMTEyMjAwMDAwMFoXDTE2MTIyMTIzNTk1OVowgasx
+CzAJBgNVBAYTAkJSMQ8wDQYDVQQIEwZQYXJhbmExFTATBgNVBAcUDFBvbnRhIEdy
+b3NzYTEuMCwGA1UEChQlVW5pdmVyc2lkYWRlIEVzdGFkdWFsIGRlIFBvbnRhIEdy
+b3NzYTEpMCcGA1UECxQgQ2VudHJvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3Mx
+GTAXBgNVBAMUEHNpc3RlbWFzLnVlcGcuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC4Z3ynISGCCLmgO6uxZXCyCy2217M4h4R8pK0wB6tQUBxqU6jr
+VI2iw1O1Xw3H18qFkk6BdjDF4fJaF9qY3qwZ5JMrL2kKCWubkHB67Ig13R8bKVGL
+SCl/h8UAbhU6g8PDUSEN/gyPVT8H/g8jOeJAS3ruE9XVdbYQUUEHV6sCBRSztz2U
+NtlGDeQYZ0haN7sX2kXk1vx4xYLzYhTEavajLtY2Kcsp8u/Uy8f1IuV9chNsLfdl
+aZrnMT/Z28qCoWAeFfz4M6bAZ6Gcyy0TeSI8BDmAqsH7WVukEZ5WEhI/wQx3+z9V
+0YnDr3ZTZlDn1Z+1WLjvRpwDfYN048D3DnABAgMBAAGjggFnMIIBYzAbBgNVHREE
+FDASghBzaXN0ZW1hcy51ZXBnLmJyMAkGA1UdEwQCMAAwQgYDVR0gBDswOTA3Bgpg
+hkgBhvhFAQc2MCkwJwYIKwYBBQUHAgEWG2h0dHBzOi8vd3d3LnRoYXd0ZS5jb20v
+Y3BzLzAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgwFoAUp6KDuzRFQD381TBPErk+
+oQGf9tswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3Rl
+LmNvbS9UaGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MGkGCCsGAQUFBwEBBF0wWzAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3Rl
+LmNvbTA1BggrBgEFBQcwAoYpaHR0cDovL3N2ci1vdi1haWEudGhhd3RlLmNvbS9U
+aGF3dGVPVi5jZXIwDQYJKoZIhvcNAQELBQADggEBADyZXmy6yj//w3chkKMS5mDJ
+c+QyGYnnANYl+3chFGMdOA0MbZV/r6bPpLj0ieHgH76jvCGq7cYDOIX2mJL5UaBt
+pFzP3P/mcrKtgiWVRKPTPSyIEOK3WhAch+kTAiyuf9BAdZXi8GUcF1SYOqxzbWKI
+gYTclKgiji9i8hTJ8NYvLjerxo+hYzXcehaXKvMH78M3qkbHQgu4vKy75hj1O3zw
+sHWt+1i6mNY63pFCGL9zZeuvmoj5USwrwcZXQ2tkwbIMAfqiuGYZnyW7oGYvYagZ
+n41/XeNFdPEQgN8XAz72MitYRzlpUzt8hPgz8zW8yn5JZ3fv56NgRigMwsQgLew=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/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">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uepg.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.uepg.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Luiz Gustavo Barros</SurName>
+    <EmailAddress>gustavo@uepg.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sivic.redclara.net.xml b/swamid-interfederations-2.0/sivic.redclara.net.xml
new file mode 100644
index 00000000..d5e66362
--- /dev/null
+++ b/swamid-interfederations-2.0/sivic.redclara.net.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sivic.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+http://cofre.reuna.cl/index.php/es/reglas-federacion
+</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">SIVIC - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's SIVIC Service</mdui:Description>
+        <mdui:Description xml:lang="es">SIVIC de RedCLARA</mdui:Description>
+        <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>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sivic.redclara.net/Shibboleth.sso/DS" index="2"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>sivic.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=sivic.redclara.net,C=CL,description=g3XkHflq7oMCiH0l
+</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDDVYzMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjA5MTQxMTUx
+WhcNMTQxMjEwMDk0NTM0WjBtMRkwFwYDVQQNExBnM1hrSGZscTdvTUNpSDBsMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSc2l2aWMucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANKco/ktHClnGMI875YaOxX4N7aoYzUMq/o+i/k9AdGM
+GTx4TZvF5WzZyaf/4r7DGjQli9T4/qUHkbC+Htkhx3RM0AV78fcA+nbL55gTmc6c
+FbzZ0prZBAoEccg6/TfJmZvbf1fNUESlTDtjnuR3vwnE2t8IfSNelz3agNprjLT6
+3U6M7M9nyyfqrk1nZ33WgugJgxUL/+nzGsyRZ6RvUpNV/p71wTzJw/HealNVSV+/
+pDoo1aosyJaJ8H6ftA+Cn5UDqwdb24evVxdpOyqO7JLonQDlZeekS92J2XmBnZ4B
+Q0DELszvnOFeO+hiznBIEQBmdmpYve7pHpkKl9hr78MCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTQXYm5du9yHiVrCQ4cEDMZ3Tox/jAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJzaXZpYy5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAERLEsxQlX9E4GGHisEp
+fniTTQz8LmQlsBHffw6r8yvml7ZVsWUV9gSYtmps6YIPT6aDPw1HyolB7CKZOWc9
+vCYQAgpw5wvtKMrv2SJSEhNJAoGbzADBVUZNrMYlRUX52L6bMTFSa8nbm1ZKn4w1
+x2FAuM2x6YSgo7AcpSUnWs8ORMZPK0P6rdBpSV6mv48RS+pzDTzNOotuuV4+KWsS
+6QbjmaC4pHRr5Wa+GkCD99HZl9xesToHBD07ru6cX8PAJ/7p9/S13+BjvElg7vYZ
+tdSiOm5NfPEpVHjPeufoeM6M1N356akvZKYJIcOSY+TVPzQT4yvcqVbhayixcOs0
+0UE=
+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>sivic.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=sivic.redclara.net,C=CL,description=g3XkHflq7oMCiH0l
+</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDDVYzMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMxMjA5MTQxMTUx
+WhcNMTQxMjEwMDk0NTM0WjBtMRkwFwYDVQQNExBnM1hrSGZscTdvTUNpSDBsMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSc2l2aWMucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANKco/ktHClnGMI875YaOxX4N7aoYzUMq/o+i/k9AdGM
+GTx4TZvF5WzZyaf/4r7DGjQli9T4/qUHkbC+Htkhx3RM0AV78fcA+nbL55gTmc6c
+FbzZ0prZBAoEccg6/TfJmZvbf1fNUESlTDtjnuR3vwnE2t8IfSNelz3agNprjLT6
+3U6M7M9nyyfqrk1nZ33WgugJgxUL/+nzGsyRZ6RvUpNV/p71wTzJw/HealNVSV+/
+pDoo1aosyJaJ8H6ftA+Cn5UDqwdb24evVxdpOyqO7JLonQDlZeekS92J2XmBnZ4B
+Q0DELszvnOFeO+hiznBIEQBmdmpYve7pHpkKl9hr78MCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTQXYm5du9yHiVrCQ4cEDMZ3Tox/jAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJzaXZpYy5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBAERLEsxQlX9E4GGHisEp
+fniTTQz8LmQlsBHffw6r8yvml7ZVsWUV9gSYtmps6YIPT6aDPw1HyolB7CKZOWc9
+vCYQAgpw5wvtKMrv2SJSEhNJAoGbzADBVUZNrMYlRUX52L6bMTFSa8nbm1ZKn4w1
+x2FAuM2x6YSgo7AcpSUnWs8ORMZPK0P6rdBpSV6mv48RS+pzDTzNOotuuV4+KWsS
+6QbjmaC4pHRr5Wa+GkCD99HZl9xesToHBD07ru6cX8PAJ/7p9/S13+BjvElg7vYZ
+tdSiOm5NfPEpVHjPeufoeM6M1N356akvZKYJIcOSY+TVPzQT4yvcqVbhayixcOs0
+0UE=
+
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
new file mode 100644
index 00000000..30a947a5
--- /dev/null
+++ b/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://skmms-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDhjCCAm4CCQC8Px9pbIuxGDANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNzIGF0IGx1IGRvdCBsdjAeFw0xMzEyMjAxMDU3MDJaFw0yOTAzMDYxMDU3MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkBFhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAy8ri5VknGxy21iuW6kalPwg7VPZBWOuV/jVjRre44tHFd5FinCQUCuzQZn37AU3ZNZg07RRyDhkAzzpsBRQf48VcbnQFRjERuQTKUfT9hzFMxgbjxW2Dayg2Ru2LkGcIUeHilOwfmRn1NIRBN+0UyJIluRvB8YGdHSSHYSMimyw9uYEuMkU9aqewwW78w7TeasCWlB6jiGfJ/SGVtPRThJ6X6KVqoU2gwIY+V7YJkG4b5TOw4HLaIsdOmU4h1Ep3igy+Zsc/7zPn+80iwm1Jk9Q8zGlEwikjPn1N3enMOxR8wpQfAQwm5lIaHNXYFcXCj3mVQ3yQ9EzB/hRC8tHwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCFRpI7U/lTwoUW/HwDb2gAmjb0RSmS+5lUWDgmjP/rJwYdh672plabNcY12DiqchtBaSeTOf4qANCqEme+YBAmssFUeLx6O1J+5aXeXfCwAA9GlswGDVeC8ZnTVmQupnbvL0T+ZU8WtkltlLEJdD6o9BtEOqk3+Rspu+94d6FUwmvWB/YWypAOfzXkkSxi+87nsadiFEOyCzTW8fZotOrZMzba52ELLJgCx3IzGLUzV80PSJwLzKYHVp0VluH2DzrxfMKC01bMklG46n1nhEo1UU2KA4vzoScmrXzD+m7nKFZ3GHFjyQvtxqG7gA34qg1Vj2o2O0vN/kvjX73SR5s4
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://skmms-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - RCMC</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.rcmc.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
new file mode 100644
index 00000000..86babd6d
--- /dev/null
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sourcesup.cru.fr/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T15:50:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - software forge for RENATER community</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">RENATER - la plateforme SourceSup</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
+ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
+T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
+dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
+sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
+eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
+BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
+TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
+I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
+R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
+JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
+s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
+Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
+WVDj2hrySg==
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
+ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
+T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
+dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
+sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
+eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
+BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
+TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
+I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
+R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
+JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
+s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
+Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
+WVDj2hrySg==
+
+					    </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>
+					      MIICwTCCAiqgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJGUjEm
+MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
+EHNvdXJjZXN1cC5jcnUuZnIwHhcNMDgwOTE1MTIwMzQ5WhcNMjgwOTEwMTIwMzQ5
+WjBQMQswCQYDVQQGEwJGUjEmMCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5p
+dmVyc2l0ZXMxGTAXBgNVBAMTEHNvdXJjZXN1cC5jcnUuZnIwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAKoHgRHVnwdX+iQIvIu2/z5I2g2ljqlYJzp74p2HYslf
+xnndqD7YodHihtoLDLIkPrGJ6Y0vtOJceb6XjoFr8k+MP41hs59s4p3qQ1M0lbY4
+6yEqLXednj00mJkz4XciB0h812bJifjH/rhYx25PdLlnp7Y9xCkq7+2BR1AFWZmZ
+AgMBAAGjgaowgacwHQYDVR0OBBYEFDgGBRQ5LF28lBPNjNWLu8YCDtxhMHgGA1Ud
+IwRxMG+AFDgGBRQ5LF28lBPNjNWLu8YCDtxhoVSkUjBQMQswCQYDVQQGEwJGUjEm
+MCQGA1UEChMdQ29taXRlIFJlc2VhdSBkZXMgVW5pdmVyc2l0ZXMxGTAXBgNVBAMT
+EHNvdXJjZXN1cC5jcnUuZnKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
+AAOBgQB05YFzaYIRKF0JL9Br0U0mCdSyyP3N9Unm2jG7yRrGXCR+2tnj16fwhQlk
+QIGLfHDFFpfBeBoWozJFBcCmFRCawnK8RYqrApvpy1M/k/Y+yIAhq8G8XfZqzU1G
+HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</ServiceName>
+      <ServiceName xml:lang="en">RENATER - software forge for RENATER community</ServiceName>
+      <ServiceDescription xml:lang="fr">SourceSup est un site d'hébergement de projets de développement logiciel pour la communauté enseignement supérieur et recherche française.</ServiceDescription>
+      <ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">RENATER</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Olivier Lumineau</SurName>
+    <EmailAddress>olivier.lumineau@renater.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>sebastien Medard</SurName>
+    <EmailAddress>sebastien.medard@renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se.xml b/swamid-interfederations-2.0/sp-test.swamid.se.xml
new file mode 100644
index 00000000..a563d053
--- /dev/null
+++ b/swamid-interfederations-2.0/sp-test.swamid.se.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-test.swamid.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/test-ds.nordu.net" index="4"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-test.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
+        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp-test.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
+NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
+o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
+WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
++MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
+vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
+QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
+YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
+yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
+7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
+yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
+WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
+0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp-test.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp-test.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAO0UNmz1orzrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTA5MTAyNzE0NTkzOFoXDTE5MTAyNTE0
+NTkzOFowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9292zBRgCYnJeviTmWQ9gDjqjtQwnvzTpZMVa
+o2gmEb8NQOPwGqDAZ8kHhhjsqXd37VjOcQc5KyfxdKnwS8zzb0GFqTyVXtJ1wjZb
+WPkOgRw1c0u7RuRgzn/vWMDLIRtymm2stX2hu1E2qctQ2zSEhiNrWdMNNArh/IKP
++MNT1a1w5QR3fbv7/Q+7T3VF2vyzFMo44FDId9kApN3/TSnJRaQ0tQQBgnZtrIAk
+vjR6B/R9qowuwK/0QIifM1KrVT9OYHA0GP708IAdEzzuzLU5vyJuAzDhBNirPtFv
+QcAKI8RfYBiwdJ29QkMAWHlNW3oP8KpUJzJ3r3KOcIHMwfSbAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBS0j9yIqP5DvTEl
+YHt7Ugh3BTVX/TANBgkqhkiG9w0BAQUFAAOCAQEANL4WmGSMJws0XzNxcodD3TVV
+yvLOLmFy8cNhB7cmz3rqoZebUqN9yWaCmZjCOMQ8Ghw++ITk/Ol0uXuCf7vKvXpW
+7AEPL12mGVfH82PhyxYnY9BZNpfAsGWpM1Nvfz7AOkngD/G8Ws2+Bf4xS4PVHzgm
+yEth2XQtHlSquOj2abA/wjguZvN0PGFUJl+ZxXxZ5mkyFmjQ+wnvF1BUlMD7qBF8
+WUA9TiYEiXgsASTgW/F038f4VNecqrBpJHU4TILmEtioGEFVLipU8huAzbcBCPYb
+0z3axBqiW0bRmgvql97lV3HRRkwGKLV1T8oiau31qQU2zzBt6jC2AQgXWjjvSg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index b80de835..a6452c31 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,9 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-08-29T11:20:42Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</mdui:Description>
+        <mdui:Description xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.clarin.eu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
 RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
 RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
@@ -29,37 +54,91 @@ s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
 fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
 ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
 nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
-hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI</ds:X509Certificate>
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Vanvalkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=catalog.clarin.eu,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIED+aV9jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMDA0MTUxMzQ1
+MTFaFw0xNTA0MTQxMzQ1MTFaMH8xCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxGjAYBgNVBAMTEWNhdGFsb2cuY2xhcmlu
+LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoF+pHBBTzECbn
+IK3k+WuiRpZCv/ECHgUqSq5mw+5x1ZOrP3qW1c/BL+mh8rPM3twPw1zh7faycCzb
+Wg6xjkzbvfnidFq394JdJ8OYHHd4629vF/QQlDiPU/WXNL1PWqh+JNoVbBeZI8Uz
++xglMyPaLn2rOTcVm5fqk6Do8DrubkZ7fxZ/4CkzJ8rTlFNOCcN8x5G2rWtcJYHa
+xS0ZBhmMt1AmqzWh7ZJCvgS9Wma4ZOhuh3xZSlaEB8o3HWAYprR6g7L+HFvmKdfK
+8oGbBViHUqsslr80Mtli15ZzxkkBH95fzYPdJTCAMccaqLhvQfjuChy7FsDYI5cV
+fvhaJQIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFPV/s0egKEIbVq/6uW/GqGNX3RInMB8G
+A1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGG
+L2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/Bggr
+BgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCyMBGsYojEQdaSJnym2OQQ
+s6fNqdPrhNcEN8KweZh9HyOgNpTEJPJpfwb4XR3pzfSRyPotr2GL80NVXTDA+YQs
+fPO0WLU0KduZtyfl1QGnYZcIpBAN53M+EvMk0Q9ruOP3FZazLPscULJnqW8Ks8/v
+ijthUt3XZFCR66qbNf7HeyS7zzYYMkyRDJN9PixRyiEAWHifqXJQzNI9dlqcy+Aq
+nnDbttGYLUyhuuT+CqcBRWJButW9x4BFUDNHrgfcPWwFhUGx3hqI2U6zqrTgesWg
+hSpV3QIescvTSt7Z39lTi6xXr6rXJMxwwpfBn292RbTvgwtTd+yxU0eOLu+3J8tI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Clarin Catalog Service Provider</ServiceName>
+      <ServiceName xml:lang="en">Clarin Catalog Service Provider</ServiceName>
+      <ServiceDescription xml:lang="de">Clarin Catalog Service Provider, verstrekt toegang tot de Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) en meer</ServiceDescription>
+      <ServiceDescription xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Daan</GivenName>
+    <SurName>Broeder</SurName>
+    <EmailAddress>mailto:Daan.Broeder@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>van Valkenhoef</SurName>
+    <EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dieter</GivenName>
+    <SurName>Van Uytvanck</SurName>
+    <EmailAddress>mailto:dieter.vanuytvanck@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
new file mode 100644
index 00000000..105ba494
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-08T21:53:28Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.mpi.nl</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.mpi.nl</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
+VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
+H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
+gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
+WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
+YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
+AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
+AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
+4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
+VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
+bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
+T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
+a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
+c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
+/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
+LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
+VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
+H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
+gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
+WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
+YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
+AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
+AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
+4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
+VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
+bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
+T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
+a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
+c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
+/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
+LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceName>
+      <ServiceDescription xml:lang="de">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+      <ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Corpus1 Service Provider for Linguistic Services</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>General</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com.xml b/swamid-interfederations-2.0/sp.ebrary.com.xml
new file mode 100644
index 00000000..f9e6bb92
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.ebrary.com.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.ebrary.com/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:15: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: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://sp.ebrary.com/Shibboleth.sso/DS/Edugate" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.ebrary.com/Shibboleth.sso/DS" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">ebrary ebooks</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ebrary ebooks</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</mdui:Description>
+        <mdui:Description xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibb01.ebrary.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibb01.ebrary.com</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC/TCCAeWgAwIBAgIJAJ7CVX1opkHyMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTAeFw0xMjAzMDYxNTEzNDFaFw0yMjAzMDQx
+NTEzNDFaMB0xGzAZBgNVBAMTEnNoaWJiMDEuZWJyYXJ5LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALuIVAFYCaz6nqWxxN9tMxXk+aXzCN0eAyG0
+HIRrO2trVL6ypFzofTm8f2+G95PRXVxzx8E8+9XOo3EpOnU8g/kVP7qT7IrUtZXD
+Vzy2iGgdgwMWrttFC+lOGCwO+bbYUAwYoXtfBh0LkG0Q4gf0TLMg3j61C36ceKLV
+dIOqDdU07YPgRls4eOpYltJjcqa52mODEO+KFJ9FWc8dmVaBRVZgaGDsoZlXhsSo
+tDTHJirO+F14ODi9FL258jF2/lodHD1irsZEGQBQatJE3zJuJ9XfTD3lFGdWq+ZR
+WF/qIMYiTvQN69b1UV5zgoGBsn2S90nEtfA98BC4JirJ5qUzy9sCAwEAAaNAMD4w
+HQYDVR0RBBYwFIISc2hpYmIwMS5lYnJhcnkuY29tMB0GA1UdDgQWBBQayHM3e6AN
+AKKlRKtofjjdfLQdFDANBgkqhkiG9w0BAQUFAAOCAQEAixoxwjRIM1LyByB/9jm0
+UEQQsDIkIYByMdLGSKmhTWNbd6aKOP3We5br6uH544XL2HlsSRQ48QHJLRBtRwvR
+2drWZgfJfUQP6iGs2rZQUjCk7EWW/cVGc0DxJef2nbvwtibk2TVZfLpjrso9T32W
+C5fDoiy5vcwBBRPdhH7xJpgBSzx71lAiYjpUZqkt3URWaPYA3RWEnP5dlRZ1SuY6
+3Nob3XeM7KrmF+lL8P1x0wKpXJo9/mHT9AURPFdgyqkIeGpJRSuOXZrp9rMtBexk
+qXS98sBULfKabCh9PFamzMzeaerLQAKf3ZGcK0f47tLo2fp4GlFUTE9EyIn9sixR
+Dw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.ebrary.com/Shibboleth.sso/SAML/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.ebrary.com/Shibboleth.sso/SAML2/ECP" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">ebrary ebooks</ServiceName>
+      <ServiceName xml:lang="en">ebrary ebooks</ServiceName>
+      <ServiceDescription xml:lang="de">Um Bibliotheken mit strategischen ebook Akquisition unterstützen, bietet eine Reihe von ebrary Pakete unter Abonnement und ewigen Archiv-Modelle, die von Hand durch unsere on-Bibliothekare ausgewählt sind. Diese abgepackte Produkte können miteinander kombiniert, sowie einzelne Titel unter Modelle wie Patron driven Erwerb und kurzfristige Darlehen für den größten Wert erworben werden.</ServiceDescription>
+      <ServiceDescription xml:lang="en">To assist libraries with strategic ebook acquisition, ebrary offers a number of packages under subscription and perpetual archive models that are hand selected by our on-staff librarians. These pre-packaged products can be combined with each other as well as individual titles acquired under models such as patron driven acquisition and short-term loan for the greatest value.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e65</OrganizationName>
+    <OrganizationName xml:lang="en">e65</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">ProQuest</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.proquest.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>jingwen</GivenName>
+    <SurName>wang</SurName>
+    <EmailAddress>mailto:jingwen@ebrary.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>rob</GivenName>
+    <SurName>wright</SurName>
+    <EmailAddress>mailto:rob@ebrary.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>jingwen</GivenName>
+    <SurName>wang</SurName>
+    <EmailAddress>mailto:jingwen@ebrary.com</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
new file mode 100644
index 00000000..8430879b
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk.xml
@@ -0,0 +1,102 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Knowledge Base+</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Knowledge Base+</mdui:Description>
+        <mdui:Logo height="64" width="318">https://vsp2.edina.ac.uk/public/images/splogos/kbplus.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
+      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
+      <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://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
+      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Login"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/UKDA"/>
+      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/EDINASchools"/>
+      <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://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/WAYF/UKall"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIESDCCAzCgAwIBAgIJAKrBnZO7TvNTMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEk
+						MCIGA1UEChMbVGhlIFVuaXZlcnNpdHkgb2YgRWRpbmJ1cmdoMQ4wDAYDVQQLEwVF
+						RElOQTEZMBcGA1UEAxMQdnNwMi5lZGluYS5hYy51azEdMBsGCSqGSIb3DQEJARYO
+						ZWRpbmFAZWQuYWMudWswHhcNMTAwMjAxMTY0OTI1WhcNMjAwMTMwMTY0OTI1WjCB
+						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGlu
+						YnVyZ2gxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEOMAwG
+						A1UECxMFRURJTkExGTAXBgNVBAMTEHZzcDIuZWRpbmEuYWMudWsxHTAbBgkqhkiG
+						9w0BCQEWDmVkaW5hQGVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAynwMFgT8x37YBNpxAGTtLJxF3iG1adpqRmin40XS86HdJP21dzsH7JD1
+						RanxUJJOWU8wud9e//ZZTC58TZbc8Zp0JRc5hlTOmLRksYt4B0QxrCqJ4EmFKlIM
+						igE5ZNgoR+lwS1ENKikIHibnVcNF9IpIkX8sTzCY18JcileM8Yz5b+R91yoha1MU
+						asRefMf2j7RR6kldAJw2Xj63aFtN0NXL6Z+HiLyg4JNslJTH9c3Ha88tI+6Ce1Q6
+						rG7rztkpHAD5Rd+ovQMysk9ihA3RN18X0Uu8LqExH2tUqq51Fmd+KQ04hyjE4gx+
+						w2T6MwPmdp6zLQSXFf6x9CeRai7MwwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+						FgQU59hHQ8+jwnn2x3Yz4BDaEaDHUrswHwYDVR0jBBgwFoAU59hHQ8+jwnn2x3Yz
+						4BDaEaDHUrswDQYJKoZIhvcNAQEFBQADggEBAB5CEE4B61l2mn/sBlc7+qN+obOW
+						gZURJvs/EeIlfR7LpWRITMSn4pE5mPR4R96tL0vNXc1jl5c2sTV9dtztazWmU+Z1
+						u3rniEM6jETPFqlmYhOPFzYWoQTB0LGv3Id0NR4dCFDtFNl+EPaQAug9C39gkOCN
+						iLZJlzOZxUALuUvebPbZMfqSTo8SdFT1Cv2No0hQIBjvlO1OimSjAWgkFR3snW8b
+						xzZ/lWUqrLDZYSo5LXQad3yNfhwi4dMJ5PRuAuTH1akdwlVf4AIeIQDm3QBKJIhj
+						TOGrFRiCdlp4cIQwN66UelzUH2KjlI/iQXYLbq5uUHN/EI47I/E0gpnYr5E=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/NIM/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML/POST" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/Artifact" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp5.edina.ac.uk/kbplus/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">EDINA Knowledge Base+</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>EDINA Helpdesk</GivenName>
+    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ben</GivenName>
+    <SurName>Soares</SurName>
+    <EmailAddress>mailto:ben.soares@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
index b6a85f66..e97615f0 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi.xml
@@ -1,23 +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:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
+<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:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <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>
+        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
         <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
@@ -46,42 +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 62c8e7de..9451fd3f 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,65 +1,155 @@
 <?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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>van Valkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,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>
+    </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/sp.swamid.se.xml b/swamid-interfederations-2.0/sp.swamid.se.xml
new file mode 100644
index 00000000..19654dcb
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.swamid.se.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.swamid.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.swamid.se/Shibboleth.sso/DS/ds.sunet.se" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SWAMID Test SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SWAMID Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
+        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.swamid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.swamid.se</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
+        <ds:KeyName>sp.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
+MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
+swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
+SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
+UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
+Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
+FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
+SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
+VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
+tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
+fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
+jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
+IznEEJKY8IltpfdkKGE20g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://sp.swamid.se/shibboleth</ds:KeyName>
+        <ds:KeyName>sp.swamid.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp.swamid.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAKP67GrfYHgtMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHNwLnN3YW1pZC5zZTAeFw0wOTA2MTYxMTA3NTRaFw0xOTA2MTQxMTA3NTRa
+MBcxFTATBgNVBAMTDHNwLnN3YW1pZC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOVNkKXqQZrXXNCk7nE7JTsqyjuwbshkafxDCI7XN6HSaRcnR+OY
+swVYkSvGXfMr4XQLzAGyIOfYDcHwOqZina11Zf8sOdD5t6mygGKza+LzbGZN9d4y
+SosskTH1NiCVBCTdJVpfwU2+K87DKrT9xtuRf7TMDDKA3gjPtN+/IxT6hw2+oZZi
+UgQgJoGN68WO9C4c/WMfcFf7hgC7fSt4fji9MFNpJoOw9MsuaRgYEVkCaHubLj46
+Ya3NbyY48zzAuc4ix8hoLJ9dP+nUCyGKtkY81HprKGtuiu8kYSo+pC20nv1Qr8xP
+FhSU14YvXPUIVOGfX9zsGVLOQKpkb4Z4AkUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+c3Auc3dhbWlkLnNlhh9odHRwczovL3NwLnN3YW1pZC5zZS9zaGliYm9sZXRoMB0G
+A1UdDgQWBBTpV1dUBMfW7y2/Rjo17VSql2/AijANBgkqhkiG9w0BAQUFAAOCAQEA
+SsYAA5tq6JjKqI5u2gvZfhM5S6ZKgrvciayGoezdTI6FfvpS3kWtCTZlu+CGDYIW
+VBpMtgQ84HpTrGbr3X1w25mspK+hsXi3K7SKqdfMdc0JynwNPrlL4GgmTuR/fgoo
+tuE0Wnbi7xdxpQ1qd0SFzw4gFWp1wC1+FsGtB9HLksSskgnNxniG9Z9+9WxgU6hD
+fJbH6eFgMDUPe2FpKiJ7LXqgiJWJRuK4zgFyGIZ5OFstLpkT/cXa8qNhtsbp2BPO
+jxcbsxoUpA7Qgl/OFu7gzxLkLrl4iRSwk8MTj2bjVBvqvisLJAmuiYDBd9iZvqXB
+IznEEJKY8IltpfdkKGE20g==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.swamid.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.swamid.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.swamid.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">SWAMID Test SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SWAMID Test SP</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.upv.es.xml b/swamid-interfederations-2.0/sp.upv.es.xml
new file mode 100644
index 00000000..6ccf0396
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.upv.es.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.upv.es/saml/module.php/saml/sp/metadata.php/upv-sp-saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2013-05-15T10:18:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.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:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</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>MIIEgzCCA2ugAwIBAgIJAJqTBSpdJw/JMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzMB4XDTEzMDUxNDA4MzcxN1oXDTIzMDUxNDA4MzcxN1owgYcxCzAJBgNVBAYTAkVTMREwDwYDVQQIEwhWYWxlbmNpYTERMA8GA1UEBxMIVmFsZW5jaWExDDAKBgNVBAoTA1VQVjENMAsGA1UECxMEQVNJQzESMBAGA1UEAxMJc3AudXB2LmVzMSEwHwYJKoZIhvcNAQkBFhJpZGVudGlkYWRlc0B1cHYuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCvyV8WKAkRHXTqikxS6XFvb9Ta3ODdklEKdpXXSofu3vOVA1aIavZChFAZtyECJs4iu/0GTmXBEqx9gwaUSpbTgl+DnMW6G7dmLtneJZ0oRddSmI/HUjnOCfh79WidyUrHtZWOMRewsLBQndHARWh2NX0GkGaVaSRzjfnJxJiQy9nQqAST0APNdPDeO3mwMC4BgV0zV2BsULG4rqubOLbQVC2f6Cv4ea3vX8zKJTiulFeCxZ7MMMtOvcr1oKCH4AcrCF1+6bEeyGpxzKMMYTn4PNE9JIPqO0AFBv1mGF2YyavsTnXhiXYk7pdIdxC4gSIVqs5go3kOikxK+xLDEiRAgMBAAGjge8wgewwHQYDVR0OBBYEFOo/c+wi4Cz6my4Ku2bGfshLHjyGMIG8BgNVHSMEgbQwgbGAFOo/c+wi4Cz6my4Ku2bGfshLHjyGoYGNpIGKMIGHMQswCQYDVQQGEwJFUzERMA8GA1UECBMIVmFsZW5jaWExETAPBgNVBAcTCFZhbGVuY2lhMQwwCgYDVQQKEwNVUFYxDTALBgNVBAsTBEFTSUMxEjAQBgNVBAMTCXNwLnVwdi5lczEhMB8GCSqGSIb3DQEJARYSaWRlbnRpZGFkZXNAdXB2LmVzggkAmpMFKl0nD8kwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAOUXfgwgDqLuSqZBTaealvbvb0z4VwGptu9rYobmVmyb5D/VfmwwPghqd+YAjNUKVJhKTKYorjoSOVMwuIrN7NnHRSP119bRxt+088EtAXrerxukMwj7sP3kxu5rBPo5RqSxXPZPhjZi7zIUZtatiqzlHuc3oshlz7RhkLPkca0Pj+npNy/X+Ql0iAcpomra3Y8+sNy9R3vJPRmhBT7L8z5r2Lj/+6BOBJAQdXQO04kBGnd6V9q/WjxJmo5AIv7HTMBBZUhFmagsHOpZ6I3tbx7kQ/xiikXuIZqf9DBIK9oceKvCi0Lr5X6PvEZLPGd+gtyjA+/vl82v3ZuUD8u/5+g==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-logout.php/upv-sp-saml"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.upv.es/saml/module.php/saml/sp/saml1-acs.php/upv-sp-saml/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://sp.upv.es/saml/module.php/saml/sp/saml2-acs.php/upv-sp-saml" index="4"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitat Politècnica de València</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">Universitat Politècnica de València</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universitat Politècnica de València</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.upv.es/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.upv.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>ASIC-UPV</md:GivenName>
+    <md:EmailAddress>identidades@upv.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it.xml b/swamid-interfederations-2.0/sp24-test.garr.it.xml
new file mode 100644
index 00000000..9fd37e67
--- /dev/null
+++ b/swamid-interfederations-2.0/sp24-test.garr.it.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
+        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>centos5</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=centos5</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+                            BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
+                            DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+                            6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
+                            JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
+                            0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
+                            ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
+                            JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
+                            M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
+                            A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
+                            WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
+                            Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
+                            uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
+                            2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
+                            Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
+                            3Qh4/sKlzs5OMglDOMb5VA==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>idem-help</md:SurName>
+    <md:EmailAddress>idem-help@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
new file mode 100644
index 00000000..0b2cdeda
--- /dev/null
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://srvcafe.ifma.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifma.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifma.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifma.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
+CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
+U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
+AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
+MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
+TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
+b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
+YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
+qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
+7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
+NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
+85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
+2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
+VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
+PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
+oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
+wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
+GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
+WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ifma.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
+bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
+CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
+U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
+AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
+MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
+TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
+b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
+YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
+YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
+qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
+7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
+NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
+85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
+2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
+VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
+PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
+oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
+wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
+GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
+WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IFMA - Instituto Federal do Maranhao</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifma.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifma.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Daniel Torres</SurName>
+    <EmailAddress>daniel.torres@ifma.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
new file mode 100644
index 00000000..101f8623
--- /dev/null
+++ b/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sse-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sse-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - SSE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.sseriga.edu/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
new file mode 100644
index 00000000..d9d5d66d
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/pozman/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-04-07T14:05:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope regexp="false">man.poznan.pl</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/pozman/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/pozman/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">POZMAN / PSNC - Poznan Supercomputing and Networking Center</md:OrganizationName>
+    <md:OrganizationName xml:lang="pl">POZMAN / PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="pl">POZMAN - Poznańska Sieć Metropolitalna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO</md:GivenName>
+    <md:SurName>Team</md:SurName>
+    <md:EmailAddress>sso@man.poznan.pl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl.xml b/swamid-interfederations-2.0/sso.nikhef.nl.xml
new file mode 100644
index 00000000..5f39b7db
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.nikhef.nl.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nikhef.nl/sso/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Nikhef</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
+        <mdui:Description xml:lang="en">Nikhef</mdui:Description>
+        <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+3P2Tx32Cq1WXCYkxLaPI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nikhef</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nikhef.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org.xml b/swamid-interfederations-2.0/sso.siropglobal.org.xml
new file mode 100644
index 00000000..1a7bd13c
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.siropglobal.org.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.siropglobal.org/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-18T14:48:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIJAJWTpV8oESWTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTExMTA4MTU1NDE0WhcNMTQxMTA3
+MTU1NDE0WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPs/gtSV28ZTUV8g20L6nE3DFkUH2UcW
+iKl3LRQT9m+e7ExNkGLJTm2NBa+fHsLGFZUWWswvGTwKNOsI/hAjUEevqXblhpbB
+TLvWFwthXO4KVLaFtodDDfPY3LMaj4nYf+/SnTEGKFUoXTVB+BUNZ9wZU853WbZa
+UVyV7kRMwQFP4uaPeIIwwjEV1bE+p+d7ya9yNIlJRhFFqyqr5Yllof3hChZqh8u7
+4FUS1qlUUxJMBSqJmcNsViTlexCHcgcjpj1Y9/tCzB4cF2Z4tZ3/oleERSdgGRiZ
+vIMEly+9dmLMELOeO7uXzt9iM+m86PhHilYmU2Dzq9QcRbRk5IkqvwIDAQABo2kw
+ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
+aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhWvrjYWWW1NKLpSe
+I7Sk2ipB0yAwDQYJKoZIhvcNAQEFBQADggEBAGe5Qh3X+fQvQd8EPYP94b+XSfBJ
+tbvHyi6gBUkBMmnafb5Hzjh0901/Vb8AnKt2Ix4fpqreyIIPHI+03XaZBC8qETtN
+XIQEqHPpuTLZn+GcuF0M/twQHq1Gtn+XBC9wVlHsEw5LhI9ZsxauDQVXOvHJkSCF
+xoE4PKbmRhdC/yEleLcHkqJRZm2ghvQq8cXkz1y+dlWmNFbHxbwGVUyiXPKH9VXm
+7uHDTq8TquEldY5/NB0w+wk5fkizj0c5xV391YjOhbIHKJ27cZ12+/7iyjJJ0shj
+DP4gOoktkZlkyPT0AUi/samZ1GKtYrOGd9Z1/7fLlYYeFyA1QdFbBX5qxPM=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.siropglobal.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">SiROP platform (www.siropglobal.org)</ServiceName>
+      <ServiceDescription xml:lang="en">Thousands of students and researchers use SiROP to post and search open positions such as internships, Master, Bachelor or PhD projects and PostDoc positions. We connect students, researchers and institutions.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">switch.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">SWITCH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SWITCH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.switch.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Andreas</GivenName>
+    <SurName>Brodbeck</SurName>
+    <EmailAddress>mailto:it@siropglobal.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Andreas</GivenName>
+    <SurName>Brodbeck</SurName>
+    <EmailAddress>mailto:andreas.brodbeck@mindclue.ch</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi.xml
index abdc0a93..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,30 +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>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/ssso.uni-muenster.de.xml b/swamid-interfederations-2.0/ssso.uni-muenster.de.xml
new file mode 100644
index 00000000..822c6f5d
--- /dev/null
+++ b/swamid-interfederations-2.0/ssso.uni-muenster.de.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssso.uni-muenster.de/shibboleth-sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-24T12:09:33Z">
+      <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://ssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
+        <mdui:Description xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFvzCCBKegAwIBAgIHFCkMo05xmTANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEyMDcyMDE3
+MDIxMVoXDTE3MDcxOTE3MDIxMVowfTELMAkGA1UEBhMCREUxHDAaBgNVBAgTE05v
+cmRyaGVpbi1XZXN0ZmFsZW4xETAPBgNVBAcTCE11ZW5zdGVyMR4wHAYDVQQKExVV
+bml2ZXJzaXRhZXQgTXVlbnN0ZXIxHTAbBgNVBAMTFHNzc28udW5pLW11ZW5zdGVy
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5ooho1OmPzYpi1Fm
+Eki2gPfFbnrzRlPl+NKU2Q4vfTPYvr3kw4TVc2Zju74QOPfSevEl8LvKKoD0kN+f
+k6jvUDxqYQvzg+7g3r5YzOCyrbfPEfXTcmdE9npsiwAUCUXnYvwPXDFfplZbh4Gh
+U0AXnMsyslNZ87zPzw/tyO+sOhgBhs+VO6EbRaf91qcr3cagVy1JlRU7VdOGfZjg
+WEvWxCYVFBYY80JLAu4uYZSZ5esASTlrxCdZM3VCJYM891/gqkG5NCXDSMesvmKL
+D6d0sGziFPvZxbS/l0NZ3UgsXu/0okQJAHch0vKxKI376BAb8NBuISCpXET7Jqpy
+btCBLQIDAQABo4ICMjCCAi4wLwYDVR0gBCgwJjARBg8rBgEEAYGtIYIsAQEEAgMw
+EQYPKwYBBAGBrSGCLAIBBAIDMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUN0KPcQA+aQQMs4gA
+IOGr5lwrQ+UwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwOQYDVR0R
+BDIwMIIUc3Nzby51bmktbXVlbnN0ZXIuZGWBGHd3d2FkbWluQHVuaS1tdWVuc3Rl
+ci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3d3
+dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggrBgEFBQcBAQSB
+vjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
+cnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3d3
+dS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcwAoY1aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAGjAt30eQ+pgzCeIYGdqsQQZd0uKk6HM+ddwxHJp
+xJI7RSD0fzcX5NbdziqIh4CM0jxCQmg7p848kiUpkWkyaKWR8TBIgGAih7hh74jx
+bVRufQdHH0mWtHCwX5xyIP8c2rXeBBvHXW8YLunmHXrYjZT4Bjg55APNX6eQoqC9
+8V8d9Cfo7LqzAdIn+l5g01yVCjDIgDApisQUrshnf9PDJE9IAm06A8/SR8q54Hsy
+WlWHVpREkz7XctQ8fMDBP6oOfeVsGSV4uZir591FX6Kl31A2n1emhntVhRWvUcyv
+V9T2iObbqKU1YkNBmgQ61s8Uyqty9zYZQNRknR0Lox4A8h4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Universität Münster</ServiceName>
+      <ServiceName xml:lang="en">Universität Münster</ServiceName>
+      <ServiceDescription xml:lang="de">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</ServiceDescription>
+      <ServiceDescription xml:lang="en">Das zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. Es gibt verschiedene Zugangswege (Reverse Proxy) für verschiedene Authentifizierungsverfahren:&lt;ul compact&gt; &lt;li&gt;http(s)://www.uni-muenster.de = unidentifiziert &lt;li&gt;https://sso.uni-muenster.de = lokales Passwort &lt;li&gt;https://xsso.uni-muenster.de = X.509-Zertifikat (DFN-PKI, Sicherheitsstufe Global) &lt;li&gt;https://&lt;strong&gt;ssso.uni-muenster.de&lt;/strong&gt; = Shibboleth-SP in der DFN-AAI &lt;/ul&gt; &lt;p&gt;Hinweis für IdP-Betreiber: Zur erfolgreichen Authentifizierung ist eduPersonPrincipalName oder eduPersonTargetedID erforderlich. Übergebene Attribute (erbeten wird insbesondere eduPersonScopedAffiliation) können von den einzelnen Webspacebetreibern u. a. zur Zugangskontrolle genutzt werden. &lt;p&gt;Ansprechpartner für technische Fragen: wwwadmin@uni-muenster.de</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/store.lu.lv.xml b/swamid-interfederations-2.0/store.lu.lv.xml
new file mode 100644
index 00000000..af83de2c
--- /dev/null
+++ b/swamid-interfederations-2.0/store.lu.lv.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://store.lu.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
+FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
+wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
+fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
+2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
+yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
+zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
+b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
+9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
+Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
+x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
+E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
+TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
+ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
+</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>
+MIIC6DCCAdCgAwIBAgIJANOTPRn8Yj6/MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
+BAMTC3N0b3JlLmx1Lmx2MB4XDTEzMDMwODEwMzcyNVoXDTI4MDMwNDEwMzcyNVow
+FjEUMBIGA1UEAxMLc3RvcmUubHUubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCxCVKw78p1ayPtIH4fKtDzmG8bxfJRy2vpZPRn6JLOMWq6eNVvHtwl
+wen+fLTgig1i56GWHPQCF5PGwWoq6xj5S/uRoinAtiIk9Zz5sUz9HtBK5AXkdpLI
+fulUNJZ1uVIe0xIVBl3pGw3ckq1v5WFpDWk2vj5gebQq2090qbgK1TTiMXh/wKZe
+2aHiPT1WCklnTvdoEOgipSl+nClBtbLrTAZh7FZAbGYbxhZI3288pwUfNR91nWu6
+yJ9qdERB8WlN+sgpGsZDKgV/Z/DW+GW1TEIgoIu757jAY/rxB3nhhoqdiFRlj3uh
+zekJxOdPSxNvOHc72c/dV8nY/EGLzd8RAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3N0
+b3JlLmx1Lmx2MB0GA1UdDgQWBBSEEH1irCcK77NEFvdXDphAFRNGJzANBgkqhkiG
+9w0BAQUFAAOCAQEAnHXx7qR4cdStfhLr6YjEqF3w2BWAitOOGKFvewsbdkTNBKL9
+Kf9DyOnnZ35uC99GxqsOQBeoOD5zawYzXPkEMb5mGDaM73RBxZdzrin9NTEy+Dwp
+x1tOkp3N4I6CanD0q+pZ2z8RTOcVtfNKQR0yHJeHM7bA41cuBZ7dNYcAiPYcrZ9R
+E6m2FLWKCd74yEkCWZjPLL6XwGFivfUfpC65O8SIWi606B0fPBPFjldkY2qe/X89
+TBhpZrPMJoN9kYql+W/DkEYWP1Nwgu6Cy4R+MLdgSSsssAKnUAPXVXDQR5vHEPNC
+ibEIPrm7mKfc0uCo6x2gKWDvjQPf/Qr/ZYNoqQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://store.lu.lv/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://store.lu.lv/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://store.lu.lv/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://store.lu.lv/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://store.lu.lv/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martins</md:GivenName>
+    <md:SurName>Purins</md:SurName>
+    <md:EmailAddress>mpurins@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
new file mode 100644
index 00000000..f964b8cb
--- /dev/null
+++ b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studienportal.vetmed.uni-muenchen.de/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-04-30T13:50:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <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://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+        <mdui:Description xml:lang="en">Studienportal tierärztliche Fakultät LMU</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://studienportal.vetmed.uni-muenchen.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>studienportal.vetmed.uni-muenchen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=studienportal.vetmed.uni-muenchen.de,OU=Tieraerztliche Fakultaet,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIEEOYptTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
+KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
+BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDEwMjYx
+MDIzMzNaFw0xNTEwMjUxMDIzMzNaMIG2MQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
+aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEhMB8GA1UECxMYVGllcmFlcnp0
+bGljaGUgRmFrdWx0YWV0MS0wKwYDVQQDEyRzdHVkaWVucG9ydGFsLnZldG1lZC51
+bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
+aVM4c+oiLWXWdu/PVBS7JHqdNKqk//w0wQoH4o/g6gRK5LiSOy3Dqloz5UpFYjNW
+D7lQEzcg1Ar/0/NsQ3HEU75k7uUaOmZi+kNse8seagyCjlfWnU5DAsPDFG7SiotU
+0AX6dPL+GkzyWKpdG7/HrGze43pFbYkB67KaAuwLHPGZwBzeyIDyL9RPjdRXflhI
+o/sxJh5tv/9tLpxNupacnk7mfz1xDlfvSLyWEjr6pL/JtLR7Z3BQ5/PISFncWO+Q
+ZfrY7TGZ/E9uS2pnfteOY22Y6rR1FiVgcIowzScVTOwyshvopoVI1/u3d+ChMhBI
+ezjRfr1udeSajAk/RqVTAgMBAAGjggHkMIIB4DAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFGIL
+BlMn4wIAUnAiU7s+tIBt1iu0MB8GA1UdIwQYMBaAFHmHeGov+pu8I0+UpqN3HR4O
+lIAPMDIGA1UdEQQrMCmBJ2FkbWluaXN0cmF0b3JAaXQudmV0bWVkLnVuaS1tdWVu
+Y2hlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW11ZW5j
+aGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+XoE3xNYk2QmdKevsY4W/szKTswy74uqQ3utXm5Hf5+/9+Cgd7BStYRZVHI24veXq
+a0YOorNUumnTkZFUB4B5OZpaDw9t80WSaefC3o1zc0PXH9+caRhoqmnBSG1JdF6L
+kY0pqAOralMzMChLKOrRb2cnjxHWa/Ug9C7XaXmEJhjP+7GCjZSLMS/du1E1wyKc
+3fN+WdEbKF4OiY1lK+MBlgDyGdXqkrAFX8JbGo1uWyGgDKu2gT7QhMeNXDPzpWn8
+YwnP4oYTHPCDNHFJR6XyRTogzebI5RgoL2eLI8SOf0LXXBTE2KvM2cOWFSmKlgFd
+NL76LsPu9j46CldHJOaVdg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e29</OrganizationName>
+    <OrganizationName xml:lang="en">e29</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Cyrill</GivenName>
+    <SurName>Matenaers</SurName>
+    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Studienportal</GivenName>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
new file mode 100644
index 00000000..2bb210af
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
@@ -0,0 +1,41 @@
+<?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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:37:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">TERENA eScience Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate for eScience applications, such as grid use.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAMphslCtGfAvMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM4MDlaFw0zMzA0MDcwOTM4MDlaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANJ78GlTdVJr8q1KWscjN4BEYwgaDQzpkfl5g0dJ/I1XhgRit1SFY1Qcu6MHgpaIJCepkwdrHeDXKJj/t/SwXOeDuwwqwYQIzHVFeGsG0fXkhpvA9Ae07bn6SlQqxp6msleHU+d4oGZnrUOcOVywnDkAaMMUvenWK42f/oBcyf0aJuFlt7ZvaBJv57/z2L02ESkQlCBH3R3NGt77GsBCNXdqGsYaz0BXgQ1U/25ofmL+HcxkbtBFlOfFKfntRMSJJZ3/osgsfkhx++ESQ88OaVdC0X1WEZcphkFjzd/QujxNRW1xlXErVhTtJvX85jYSwoQ0Hl2aO1lF7qundGBYYOsCAwEAAaOBzTCByjAdBgNVHQ4EFgQUFDOLIP6//PMYotoXXSVbz65lyAIwgZoGA1UdIwSBkjCBj4AUFDOLIP6//PMYotoXXSVbz65lyAKhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1lc2NpZW5jZS1wb3J0YWwudGVyZW5hLm9yZ4IJAMphslCtGfAvMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJhZchVmfk3ASZ1Spgk56942jWUZCVuloJpo6m0nxQvisa/ZcdsVVfbHFS8AgH79Fub253qHMPzasCfh/WWNn57SVf7QcP+ROA0JuPjmE7gAcPvEb035/tw/3+I5rmNWIq2HVW9ySs5dJVv+p9j1ecr5kLiD4eNJRQxUD0XXNkruWF4NChxTREUim/WaIBy8qlt8ljXF3zyXwkQ7KchQ8/vQu2/4g4cVrjOZR8oulgpTOZcVnVwzdfYZSicWxHv3TkGmc5mPBtUxfUKcuLBbJX38K8346P8aQnizVN26gsW2LbGUEsPwg9HgGnGxaMtL4m/fC32Y7lxU4X6D0MsH3xY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </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/tcs</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
new file mode 100644
index 00000000..03b10873
--- /dev/null
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
@@ -0,0 +1,41 @@
+<?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://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:31:26Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">TERENA Personal Certificate Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows you to get or deactive a personal certificate.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.terena.org/tcs</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEITCCAwmgAwIBAgIJAJAgPhRkNLb/MA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzAeFw0xMzA0MDgwOTM5MTVaFw0zMzA0MDcwOTM5MTVaMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBcWpnN9ebHCveyj0WRiPOylNZXR+KG1uRaiTTT0gDjeajlUlZioQGLX0uoxqWy9D/l86LrAq6VEHX4OaBA+Xz0QonTcLz2ri1Vf1GYDjHtInc+UO6pMQHKCdbxMfS97dUXqz++H25xav/cdSPxXvc9a9mIb3DT2yaR9qsUIR2kGxXqdwoZ1fClQLJOPvEGonvlxxNBfLvaJuhvIGtKx0IXvGdnXEl3bzvp2bGPAwUxSEnFcnhjr4qmIs5QEqaqkSOmfKqwv+v2GCXdUOBjkELGVO4475tR4ouIi5rVoWmx3Tg21m/AWa5UbTBdSS6Di6n2QXsk+0j1L/FVji6exhcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUoPN3NNk77LXCa/WThDYvPCp7gPowgZoGA1UdIwSBkjCBj4AUoPN3NNk77LXCa/WThDYvPCp7gPqhbKRqMGgxCzAJBgNVBAYTAk5MMQswCQYDVQQIEwJOSDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExJzAlBgNVBAMTHnRjcy1wZXJzb25hbC1wb3J0YWwudGVyZW5hLm9yZ4IJAJAgPhRkNLb/MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIrsiiKJmDtH73e8oySp/In6QwCw2y2v0MJ9yHrPOdlTH4dQ3QFaGOaKIcD1McdKN1xWCKE6FudqVr3nuJZVliSL4rM+RE+v4gkTuNFzzz/2ARR2EkCn14K/7FuM1kGoUfIHYloB1NohRvJup3vDRGpuvutWJjOznmfxdM5aUCYYzR1fX3GTVanuaYGNzKhpKnDIjlBuZwUx/YEzEbBlTmdh5I3s5PidRnQdU4EnD2rBoT3nuqgYKLoC0d4eN9LvpI14evq9Z4WrXhEJwU4ItX5OQz+iLB6Y7LX3JBqucdfKHYcPI+yvvQVxbeSuTWIB9vhooOqjt8jxGzrBq8arBmc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </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/tcs</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index 7b64359e..3b1161df 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,32 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo height="94" width="350">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net.xml b/swamid-interfederations-2.0/test-adfs.geant.net.xml
new file mode 100644
index 00000000..6ca45221
--- /dev/null
+++ b/swamid-interfederations-2.0/test-adfs.geant.net.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test-adfs.geant.net/adfs/services/trust" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Intranet Test Instance</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides access to GÉANT project documents and internas. Test instance.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEcjCCA1qgAwIBAgIHFoCBhVY+iTANBgkqhkiG9w0BAQsFADA3MQswCQYDVQQG
+EwJERTEPMA0GA1UEChMGZWR1UEtJMRcwFQYDVQQDEw5lZHVQS0kgVGVzdCBDQTAe
+Fw0xMzEwMTgwOTQ4MzdaFw0xODEwMTcwOTQ4MzdaMG0xCzAJBgNVBAYTAkRFMTEw
+LwYDVQQKEyhUaGlzIGlzIGEgVGVzdCBhbmQgRGVtbyBDZXJ0aWZpY2F0ZSBvbmx5
+MQ0wCwYDVQQLEwRUZXN0MRwwGgYDVQQDExN0ZXN0LWFkZnMuZ2VhbnQubmV0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ZgGj3cbCZgNNTCY0P2g8jov
+74KFsNXtaPPM0vNT+RlmdfmqLVNFkCz90HHx+1ZFF98YYF3kNqvtipEYhv8AplU+
+j/UR9I6rPTEvHtM2BFrCv3fvsvLitkcYQVi4NDjI8Qzv4ugVGzfeC3vlPPOwNdsA
+wLsKrIKG5QbnDkgaJMuIKorsUD0QBOb/bema0x77jXWyo7Zsrz3EWE6x9VreBLde
+4bzWdvig79oYBCvYbzckS77qweOY4oDB2oxF96wf0UlyC26u40cyGBkWuwke3DX+
+mypM86il05F5gxbMq0iOt1e+rv4ewqzyLdCEEyrG1Iez9qYIZTqiKoCKCZNlcQID
+AQABo4IBSzCCAUcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsZ/2CP8ljz4lbwswK7TlU+wvn
+uTAfBgNVHSMEGDAWgBSod7exoyNlktqfxGUUmz5e7PjKIDAtBgNVHREEJjAkghN0
+ZXN0LWFkZnMuZ2VhbnQubmV0gQ1zeXNAZ2VhbnQubmV0MEcGA1UdHwRAMD4wPKA6
+oDiGNmh0dHA6Ly9jZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDBWBggrBgEFBQcBAQRKMEgwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
+ZHAuZWR1cGtpLm9yZy9lZHVwa2ktdGVzdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQELBQADggEBAEgQ/IltN/cqHX76ne//6A3sHGdPmc37aIwF
+8x+9d7XrKMp/OPuU7B+rrIAw0NTh8lI6jtjksSJ+ONnTvMmNChpbyGt/MoCpzN96
+43SCBG69g9p65YQRbsjbk+F29ddyxbNMGMRRHmU3y/5PuaKT/kxwhI2qdG8jYos7
+OVRy4URr0xxsk41aMJbyW8G9g8TmHMUwY+SwfvYXziQ4Jf67MMMf4a8c2ywZJXTz
+8Yu/S/of6N7uF5SXxIAsTqBWPsFm5Fs9MbAjqH5+itfgPbvh2OsigzD5yODRBfDV
++i8UK1ae+ilwPcADJEuc04gZiy3dz1a4rhRmDg+bleNBtH2J/JQ=
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT Intranet Test Instance</ServiceName>
+      <ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">geant.net</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>eduGAIN</GivenName>
+    <SurName>Integration</SurName>
+    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>eduGAIN</GivenName>
+    <SurName>Operation</SurName>
+    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr.xml b/swamid-interfederations-2.0/test.federation.renater.fr.xml
new file mode 100644
index 00000000..1fedf255
--- /dev/null
+++ b/swamid-interfederations-2.0/test.federation.renater.fr.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-09T15:20:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - ressource de validation de la fédération Education-Recherche</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+Il faut configurer manuellement les filtres d'attributs pour cette ressource.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
+PbS4vQ==
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDADCCAeigAwIBAgIJAJo2eFCDBL32MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2ZlZHRvb2xzLnJlbmF0ZXIuZnIwHhcNMTMwNTEzMTQ0MDI5WhcNMjMwNTEx
+MTQ0MDI5WjAeMRwwGgYDVQQDExNmZWR0b29scy5yZW5hdGVyLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLeEy6JlbrAPEwxBrnvwcx2fN5WtZ9Eq
+lZHBgQFocnfxEtHpf7KGSll+LNu3AgqF10Ymljoa1+Gn6E2SbsmKFmXzOs31aB5t
+eu79nAGci1abkuius628KO33o4Cjc3rJ/M7Rk7Px4t9kH7R01bXn3z3UGTvmPNyo
+mfa8LAX8epaD4haoar3ymF0hFHFB57d2HzWC/2HW/OT0Y5CO7T+dJd3TxI/soiK1
+pdw75LYAOdW6MT+ozrw3vY53B4um7jBZK2OhsrKIjrG2e4s0CzWFPs7jCUGnuvaY
+21nAd/kR666LjvmJcoVq/vErOSKksvMS9SxiuKpxjQNkj9lB9klqvQIDAQABo0Ew
+PzAeBgNVHREEFzAVghNmZWR0b29scy5yZW5hdGVyLmZyMB0GA1UdDgQWBBSglPv7
+4KwzHQSzBtZphKPBskiQ5TANBgkqhkiG9w0BAQUFAAOCAQEArYVUgbOsV3U+/Xb/
+NPPYIYdej09vWmdwOQjCjJc/DHiEkDPHQ4R/zbTEXPcW+t0CpYET2t/5MskmKNU7
+vgkZLdw9GrRbXuJarzZZ1ZSdMDNKvMjgujOJfcgQ6KnbSi/KLniU7hagAsvzQkYQ
+CXZqh5Jo6zGSJZIPTx3EpRuT82WFoFpcoccWeTSsda/A5nTQnq/1SpwBnfGz+xtE
+alqV781u8dMtyty6cbwPSg3sYisSoXQRdl+4b7U3vGXQvbHM6PNEAljhkeX0+1Tk
+aCoF678JhADPvQCtWTWZsbIFhV7bOsG+8UFqdH6z+yPMWUCPx6WbbTkkusi23Tbe
+PbS4vQ==
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</ServiceName>
+      <ServiceName xml:lang="en">RENATER - ressource de validation de la fédération Education-Recherche</ServiceName>
+      <ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
+Il faut configurer manuellement les filtres d'attributs pour cette ressource.</ServiceDescription>
+      <ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</ServiceDescription>
+      <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">RENATER</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>support-federation@support.renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
new file mode 100644
index 00000000..3acfb604
--- /dev/null
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.ukfederation.org.uk/entity">
+  <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>
+    </mdrpi:RegistrationInfo>
+    <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"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This test service provider allows you to see the attributes your identity provider is releasing.</mdui:Description>
+        <mdui:Logo height="216" width="500">https://test.ukfederation.org.uk/images/twigs_500x216.jpg</mdui:Logo>
+        <mdui:Logo height="104" width="240">https://test.ukfederation.org.uk/images/twigs_240x104.jpg</mdui:Logo>
+        <mdui:Logo height="43" width="100">https://test.ukfederation.org.uk/images/twigs_100x43.jpg</mdui:Logo>
+        <mdui:Logo height="75" width="75">https://test.ukfederation.org.uk/images/twigs_75x75.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Login" 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://test.ukfederation.org.uk/Shibboleth.sso/Login1"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ukfederation.org.uk/Shibboleth.sso/DS" 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://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYF"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/UKfedDS" 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://test.ukfederation.org.uk/Shibboleth.sso/UKfedWAYFall"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/UKtestWAYF"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/UKtestDS" 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://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYF"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/TESTfedDS" 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://test.ukfederation.org.uk/Shibboleth.sso/TESTfedWAYFall"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/TESTtestWAYF"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/TESTtestDS" index="6"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/EDS"/>
+      <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://test.ukfederation.org.uk/Shibboleth.sso/EDS" index="7"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDADCCAeigAwIBAgIJALYNI4chorkFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE3VrZi1zdmMuZWRpbmEuYWMudWswHhcNMTEwMTI4MTY1MjQ2WhcNMjEwMTI1
+						MTY1MjQ2WjAeMRwwGgYDVQQDExN1a2Ytc3ZjLmVkaW5hLmFjLnVrMIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8qWcZAP79noTlNXCrHVJoUUgWlcaBQc
+						V94tQnjUo313VRnbzWgaghHfv8xFEXpWRjQhTOCuAugI3wKmKVjmJQmSYhNc6pgJ
+						lUSUwlefMu2kDBhU9fcY9YhqMgMcsMYNkHygU0gMIZm2HDkJGxTM/BU03VLCM/8o
+						oJqJBqArueI2Crt/6emG2dT9KkxBhYb+mKiI4N8vK/XS6bCQHoAZTsh2fMCcjP/z
+						mI4oGoitkoEEYh4tHf489XQXmCXil7parkOfYPiSbOscpTMnKw+e1E9otaoDakH1
+						Sgs81mRPAWBcWttIOSmS75a6mfooDeVNAE5S4iGuakKTw424ykb96QIDAQABo0Ew
+						PzAeBgNVHREEFzAVghN1a2Ytc3ZjLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBT4yzTF
+						d+G9wC0XOImSgaDBtORrbzANBgkqhkiG9w0BAQUFAAOCAQEAFsLiJAnNO6EQiXwx
+						hdKhH40h4veNxKL4bq3azVkH/YP7Ej8uQ89Ta+aR6xC+TDuvt2Baj3bmN5Dxejen
+						r4I2/WP0eR6nH4r2vZ0cNKNDV2LBcjmxJhvcOM5151HzRDxNdw9nNHfR5kFreU2N
+						ee/3SL8B+EZrQCu9mKZSL1OwuQbm9I9tp7Aqp414UDG9ivZIorrkIA5cJplfOaR9
+						/gIB1Eu9tAgJgofTwi9bzNde2kjOY410MZFfya1T7juPUJYx5WEJ0oHkJLbilx/W
+						2UAEC+Ir/a8rk/IjmVn+uHAyFUJCizUMUiYXlaJSiV3ltexNYOMgj/llrYMKgIjS
+						0HjUig==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</ServiceName>
+      <ServiceDescription xml:lang="en">
+				This test service provider allows you to see the attributes
+				your identity provider is releasing.
+			</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UK federation SAML 1.1/2.0 Test SP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>UK federation helpdesk</GivenName>
+    <EmailAddress>mailto:service@ukfederation.org.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>UK federation infrastructure</GivenName>
+    <EmailAddress>mailto:ukfed.infrastructure@ed.ac.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
new file mode 100644
index 00000000..5a5f64dd
--- /dev/null
+++ b/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testssso.uni-muenster.de/shibboleth-sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
+        <mdui:Description xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF+DCCBOCgAwIBAgIHFCidFzwGDzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEyMDcyMDA5
+MDYxNloXDTE3MDcxOTA5MDYxNlowgbExCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
+bnN0ZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCYK4Y7STE
+L8OlunXF0IQl7BqeJQVZ88sfR3yHWqwihuhh5Xy+xqBHpVg07VbOMr9E+cx0zgOO
+wqMkTIA6+B7RfI5EGiIaiUI3TUew1oibfFqwQ7GC34rawnVzYmOiOHoKdBqD8KTN
+hR5zdDK64OdhrmUCCQ9ViSelXoBK9oo7ko3IqmEJrSWc8EqN5/k4/LEQuieJJEok
+YHuIAKTWy5tyglVcN0mlpR+kZOeKf96IO14z71GmMbUSNHepidzSyoTL5Na9uG0u
+dchHkrDRkdJtr9Ou23P75bJLuRJ+K8wo1sT63lCinEhupK91z3vHg0DsA8v6uBit
+UyGfTxnz4izLAgMBAAGjggI2MIICMjAvBgNVHSAEKDAmMBEGDysGAQQBga0hgiwB
+AQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRYwYC2Uz5H
+6Ynz6B811VlykXutszAfBgNVHSMEGDAWgBS+nlGiyZJ8u2CL5rBoZHdaUhmhADA9
+BgNVHREENjA0ghh0ZXN0c3Nzby51bmktbXVlbnN0ZXIuZGWBGHd3d2FkbWluQHVu
+aS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACQHZ+2pf6Lyk2q7Teu2nPxG1uAz
+KmEKY2GkQmDpySrcVn5Gex4b2EtmgcmEOXgzHtYHOlJYcSjHVLZt+41eTsh5si8D
+ozAv2qIJV/RjRg9btBCHYJRsxoP5rRuZZ/ASfCb+stJWgx+1gu0PodosZgFKiM2E
+3zWjeMkqDxP9uS1NLyB+/V8N67cdOYdP/dKx9dIw+rCeAsr0OlFaEX3q/LzA2NWU
+O7HVimoyfRBz43eqdPCoyZ89aMPYdktSICu/kaOXHtAp1j4BrDwr3fnbE+lPpU/1
+EecubiQE8/Mek9uGrP8kBfIyCBKwvjxuXqgCIBhis6wo9C1/uM1c4uiqg7M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Universität Münster (Staging)</ServiceName>
+      <ServiceName xml:lang="en">Universität Münster (Staging)</ServiceName>
+      <ServiceDescription xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</ServiceDescription>
+      <ServiceDescription xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
new file mode 100644
index 00000000..a5ca4d59
--- /dev/null
+++ b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://thalamoss-data.ics.muni.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">THALAMOSS Data Management Platform</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">System pro spravu dat projektu THALAMOSS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Management and distribution platform for THALAMOSS project on personalized therapy of b-thalassaemia</mdui:Description>
+        <mdui:Description xml:lang="cs">System pro spravu a distribuci dat projektu THALAMOSS pro personalizovanou lecbu b-thalassemie</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://thalamoss-data.ics.muni.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/ds" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>thalamoss-data.ics.muni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=thalamoss-data.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIQNd5X+bSLsMpg3WZ/IC3PmjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxODAwMDAwMFoXDTE2MTIxNzIzNTk1OVowSDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExp0aGFsYW1vc3Mt
+ZGF0YS5pY3MubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKUGwM1e1CiGbQVgLW460tAetS5QUTSANMKZEzThUgJYdI2mYJWp9NwF5bXelMo+
+lFObDPcG7wEc8+DpdpKGskBEE4SmcHbcKFE8/hmCYHPbf5AUrjPCei3XKDMbtIaC
+Htmut5AjE4gsG9GJa5vCFCjcsJgIdIat/PQp7++IOMc+qXx5WR22mUroYR15V89u
+jGe7CfjonOUmB4xxj5AVW73xcGEsAgYS1vmCGo3utSiawlgBKYENCTyb6e1AdbQ6
+MS1SBcN1gvFQH6ONoX2gXFG5NAEF1PCwevcUePVoJyUux5grmnBH6wE/7SOp8ygI
+7c6bUVZINmO9s5KY+Ohc7LUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT+kNRsn7KWuNVl5xuCU3uOlH3ElTAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIadGhhbGFtb3Nz
+LWRhdGEuaWNzLm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAGXev97kSHOHKFTd
+Pb2+xAETh0vA4q5UFVUF96i0yqpOlpmeWF7gV+7VCSI0WOVfWJQE8LeE17KRymb2
+h4G6AetotMBoKdzPxVmuSTIT2GA3q/cMeNWt9Kc1xaFZ73/vV9kJ5ioA/Vqpbk3B
+BOn8kS74xu0s1frpPS3rn23kRY/3LsQORCi0RUhNcio1LcGbkUQ1J7nlEYXt62rH
+6kAGlj0ycmn4GA0vnQbgw7iAYh72rPmH2vvLyXrEf6wKo9L1ywQ7ag9BvQaxCLoT
+gRtPrP5JXkY5jYK6rsPAUltcTEPXxRkxG7CX92WXKlX5/1MXRk3wZV5ZYyh+TGKe
+3EudFd0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/artifact/soap" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/soap"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/post"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/slo/artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/soap"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/post"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/nim/artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/post-simplesign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml2/ecp" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/post" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thalamoss-data.ics.muni.cz/auth/shibboleth.sso/saml/artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">THALAMOSS Data Management Platform</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Management platform for THALAMOSS project on personalized therapy of b-thalassaemia</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science, Masaryk University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Ustav vypocetni techniky, Masarykova univerzita</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ics.muni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.ics.muni.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Petr</md:GivenName>
+    <md:SurName>Holub</md:SurName>
+    <md:EmailAddress>holub@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Sochor</md:SurName>
+    <md:EmailAddress>325304@mail.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/theia.unifei.edu.br.xml b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
new file mode 100644
index 00000000..1a4aad9d
--- /dev/null
+++ b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://theia.unifei.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifei.edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
+VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
+MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
+aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
+W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
+fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
+QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
+ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
+nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
+SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
+6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
+UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
+9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
+AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
+msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://theia.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://theia.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://theia.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://theia.unifei.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifei.edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
+VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
+MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
+aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
+W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
+fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
+QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
+ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
+nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
+SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
+6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
+UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
+9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
+AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
+msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unifei.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Everaldo Campos</SurName>
+    <EmailAddress>everaldo@unifei.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de.xml b/swamid-interfederations-2.0/tumidp.lrz.de.xml
new file mode 100644
index 00000000..7e211e0e
--- /dev/null
+++ b/swamid-interfederations-2.0/tumidp.lrz.de.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
+9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
+QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
+iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
+iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
+2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
+IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
+dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
+29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
+4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
+cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
+Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
+AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
+9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
+QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
+iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
+iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
+2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
+IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
+dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
+29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
+4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
+cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
+Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
+AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
+9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
+QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
+iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
+iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
+2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
+IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
+dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
+29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
+4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
+cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
+Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
+AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
+FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
+EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
+ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
+TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
+9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
+QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
+iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
+iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
+2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
+AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
+IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
+YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
+dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
+cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
+BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
+cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
+KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
+29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
+4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
+cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
+Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
+AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e8</OrganizationName>
+    <OrganizationName xml:lang="en">e8</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>TUM IT-Support</GivenName>
+    <SurName>TUM IT-Support</SurName>
+    <EmailAddress>mailto:it-support@tum.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
new file mode 100644
index 00000000..f3962283
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://uat-adfs.geant.net/adfs/services/trust">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T17:06:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT ADFS (User Acceptance Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
+						MuFyz7mc
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIIojCCB4qgAwIBAgIQfoxrYI8bPClvLVhlQwiU/zANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTE0MDIwNDAwMDAwMFoXDTE3MDIwMzIzNTk1OVowPzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExF1YXQtd3d3Lmdl
+						YW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL5OW7kGWzND
+						Q5/5RlPlHElH9zXF1L53YVLmi7PCVGgRcUW9X5EH/9obrP4c0MzdlGbC7RYf+9mK
+						77P1ApSlTi00FA7LS4Wf5JythfHvs1YqJQRz1RU8r+AFV4p65UpafSKnk8mx0vcb
+						KcOyo5cMUhhAt72v8rMzMXlNQk9+tM5liLdwOViLUJCRp6ZbwPj2gt+MDWzV8jC3
+						MWmK7OSW19FNOzj3yMlrTnUDDu1J5R8/ICocUzrRDAyq4PdtbAWu2UdbZdfu/ISi
+						Wg7w1CGIhWJMgM4bzZLl02KCo3yEtvLvRuH6u1JUlqFtbV1pDNQ4dW4rrmWuNWgx
+						hWP0Vh5vWdsCAwEAAaOCBaEwggWdMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+						R+qQ47ntMB0GA1UdDgQWBBT8CQHkvrrktHXoJLNb7Az5h7kqTTAOBgNVHQ8BAf8E
+						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+						c3AudGNzLnRlcmVuYS5vcmcwggRNBgNVHREEggREMIIEQIIRdWF0LXd3dy5nZWFu
+						dC5uZXSCEnVhdC1hZGZzLmRhbnRlLm5ldIISdWF0LWFkZnMuZ2VhbnQubmV0ghV1
+						YXQtYXJjaGl2ZS5kYW50ZS5uZXSCFnVhdC1hdXRvYmFobi5nZWFudC5uZXSCEXVh
+						dC1ib2QuZ2VhbnQubmV0ghN1YXQtY2FyZW4uZGFudGUubmV0ghN1YXQtY2xvdWQu
+						Z2VhbnQubmV0ghR1YXQtY2xvdWRzLmdlYW50Lm5ldIISdWF0LWNuaXMuZ2VhbnQu
+						bmV0ghd1YXQtY29tbXVuaXR5LmRhbnRlLm5ldIIXdWF0LWNvbW11bml0eS5nZWFu
+						dC5uZXSCEHVhdC1lYy5kYW50ZS5uZXSCEHVhdC1lYy5nZWFudC5uZXSCFXVhdC1l
+						ZHVjb25mLmdlYW50Lm5ldIIVdWF0LWVkdWdhaW4uZ2VhbnQubmV0ghV1YXQtZWR1
+						cGVydC5nZWFudC5uZXSCFHVhdC1lZHVwa2kuZ2VhbnQubmV0ghB1YXQtZXUuZGFu
+						dGUubmV0ghB1YXQtZXUuZ2VhbnQubmV0giV1YXQtZ2VhbnQzLWludHJhbmV0LmFy
+						Y2hpdmUuZ2VhbnQubmV0ghx1YXQtZ2VhbnQzLmFyY2hpdmUuZ2VhbnQubmV0ghJ1
+						YXQtZ2lkcC5nZWFudC5uZXSCFXVhdC1pLXNoYXJlLmdlYW50Lm5ldIIddWF0LWlu
+						dHJhbmV0LmFmcmljYWNvbm5lY3QuZXWCHHVhdC1pbnRyYW5ldC5jYXJlbi5kYW50
+						ZS5uZXSCFnVhdC1pbnRyYW5ldC5kYW50ZS5uZXSCHnVhdC1pbnRyYW5ldC5ldW1l
+						ZGNvbm5lY3QzLm5ldIIWdWF0LWludHJhbmV0LmdlYW50Lm5ldIIWdWF0LWludHJh
+						bmV0LnRlaW4zLm5ldIISdWF0LW1kc2QuZ2VhbnQubmV0ghJ1YXQtbmV3cy5kYW50
+						ZS5uZXSCEnVhdC1uZXdzLmdlYW50Lm5ldIIVdWF0LXBhcnRuZXIuZ2VhbnQubmV0
+						ghd1YXQtcGVyZnNvbmFyLmdlYW50Lm5ldIIRdWF0LXBsbS5nZWFudC5uZXSCFnVh
+						dC1zZXJ2aWNlcy5nZWFudC5uZXSCGHVhdC13YXZlbGVuZ3RoLmdlYW50Lm5ldIIW
+						dWF0LXdlYmxvZ2luLmRhbnRlLm5ldIIWdWF0LXdlYmxvZ2luLmdlYW50Lm5ldIIX
+						dWF0LXdlYmxvZ2luMi5kYW50ZS5uZXSCF3VhdC13ZWJsb2dpbjIuZ2VhbnQubmV0
+						ghh1YXQtd3d3LmFmcmljYWNvbm5lY3QuZXWCEXVhdC13d3cuZGFudGUubmV0ghl1
+						YXQtd3d3LmV1bWVkY29ubmVjdDMubmV0ghV1YXQtd3d3LmdlYW50b3Blbi5uZXSC
+						EXVhdC13d3cudGVpbjMubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCBhFhaVetfTvO6
+						i09vIxNWRlO5kFxXzeVDuHbm351hshNBdkKn+wIynpGOr55RrbO9N3DeupyxD7yL
+						bAOmoo72KXi1hfWfHavmKEn4eYbkvGfa6tWhudLWUg53R2ddXFlEpjR476Ydw4K0
+						GxbHcI1+XRKqrKEaxbqxhonQL98tW3QPLMTApJgQ4pyP3WY/jTW4B24Y7mrVNIIq
+						eTvZVDJJOberCcq9MDxZsF5RYOeVgKpkuT8XbDr4xKXkgmmGRsMx3eRKntEj7EfC
+						0eNbLLVlydzw/rOP2UPXDsSmb8DEUMD12OSi+Nq7/0MBgmYtNqesmiqI2cxmjIE9
+						MuFyz7mc
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-adfs.geant.net/adfs/ls/" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT ADFS (User Acceptance Test)</ServiceName>
+      <ServiceDescription xml:lang="en">Active Directory Federation Service (UAT) for GÉANT Intranet.</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="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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>DANTE IT Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE IT</GivenName>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
new file mode 100644
index 00000000..4301e427
--- /dev/null
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
+  <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>
+    </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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/wcc"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDWzCCAkOgAwIBAgIJAOAh4h4v+OW9MA0GCSqGSIb3DQEBBQUAMC0xKzApBgNV
+						BAMTImVtLXVhdC1yaC1zdnIwMy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTEwNzI3
+						MTQyNjE0WhcNMjEwNzI0MTQyNjE0WjAtMSswKQYDVQQDEyJlbS11YXQtcmgtc3Zy
+						MDMuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+						CgKCAQEAnGjTgEi/bQRHpc9poXHq5QlfQomoyoCO5et3+VB4J65HOpP/PkxPE6ah
+						kBTrzJstsD7SDatrcRM2aL28yjT+pj+mHR0x57JIMH8bC64Wy6xxC2/aj1dBZ1J8
+						xo4tLJuy3ojfb7eNSHg8UuJO3pRWIC3TtzXJfQuNiTY/8M32u3i4aY+1rss87BQ6
+						F+4G4MDC7EnjEm0f28WtweCC9+S5sm3AuxVEAwJuLMYJLJPfz5tgwDKYAeU9DmST
+						kLiPgzr1roGEd6Bz6/o6t8rbaSUX4S7Dk6K/gVAJf9wFFvina/M2krLJC0yODqXY
+						p2/8hVVm3uw02XRULx6nv8VRzQ+iuwIDAQABo34wfDBbBgNVHREEVDBSgiJlbS11
+						YXQtcmgtc3ZyMDMuZW1lcmFsZGluc2lnaHQuY29thixodHRwczovL3VhdC5sZWVk
+						czEuZW1lcmFsZGluc2lnaHQuY29tL2VudGl0eTAdBgNVHQ4EFgQUwEzN/hOiH7zK
+						9Mrx+j9GNUPpbUEwDQYJKoZIhvcNAQEFBQADggEBABmXktnHYciTi91g9J/lveDc
+						ZwLUQ9gwi/CrLe1SX1vxI9Zou1qt4WEVXcltofO5JQ4wbbJKOgB6avy56iY6qAcw
+						+3A16o6lZHP+0Q/pomdZPiIxHCe5ZVjlk9OXhBRiAZiY9dI1VNKM3suGkGsDoQQm
+						dojusN4+Hfv/E2gQi4iCJWmWvUbT7rTNkyVeWGBMEUJRCCAHUP5aZcqMVGwqvVlG
+						RqkhtZpBnQu/XTEhKw9xhlpid8XUUEwAz+hfY/Hzf1YhyKCmLc9q709/sPOfnqTq
+						ONpDCEUvKV32/tyP4qR7RwMnwVEtN29Vrc9XZQ+n6zgm47u4WotML5m4gmr0Wqw=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Emerald Group Publishing Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Emerald Group Publishing Ltd: UAT Site</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://uat.leeds1.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/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
new file mode 100644
index 00000000..adf8b800
--- /dev/null
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
+      </mdasrt:Attribute>
+    </mdattr:EntityAttributes>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <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:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:Logo height="29" width="29">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAdBAMAAACkvXo8AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAABJQTFRF////6ruX6aZ44Hs48+fc5ItNY8IEdAAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAABXSURBVBjTY2AgDggJoPKNUfkspg6ofBUkjmgoSJIpEMYXNgbzjYYPHxQYrIYwvrNxCEjUBMZnMgaGjpOxAjxAgo1NQ41NEQHEaAwEyAHKKKQoQmTEoAEATVsQ7xmwu4QAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTMtMTItMTdUMTQ6NDI6NTgrMDE6MDACpPM3AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEzLTEyLTE3VDE0OjQyOjU5KzAxOjAw1Y5APwAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="2"/>
+    </Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
+HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
+ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
+XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
+495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
+DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
+2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
+5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
+cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
+3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
+fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
+k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
+sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
+adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
+IhAZYQU=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pavel</md:GivenName>
+    <md:SurName>Straňák</md:SurName>
+    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch.xml b/swamid-interfederations-2.0/umbrella.psi.ch.xml
new file mode 100644
index 00000000..b6fc3c63
--- /dev/null
+++ b/swamid-interfederations-2.0/umbrella.psi.ch.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umbrella.psi.ch/">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Umbrella Test Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIJAPuvSPAzAC6mMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD3VtYnJlbGxhLnBzaS5jaDAeFw0xMzExMjgxMDQ2MjBaFw0xNjExMjcxMDQ2
+MjBaMBoxGDAWBgNVBAMTD3VtYnJlbGxhLnBzaS5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMHaKoQKIBkNpDp0I5R2yZ7uy2WShKsDm9IMxz+D0EzL
+S7k/KCKIt15E6iksEvy6KhKQUmHDjx0T/W9D+hZkAj3NaSytBCB3phGrMUFSotw9
+/GSt0e/C4x0Bju/SD5OwLOAX5QvMJllMlkGTUXQ+T6LcNBcA5kSL/jza2vssAOC0
+9vz0zK7uAxGG2/IrZ55UGL6RFB5lV4m+45DLjd/bnmk0KzPDbfCgpnq+kc4NUFov
+ECrZUJ+CkOUdS6x+Jg4wsUyYWHAMA77JoQtJUWYzLMlaN/hfWoIwsG049Wp20+w3
+axkrc0u/Bd+YQB2e66sv+gzMfpxkoxs78qv9uJGaNo0CAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPdW1icmVsbGEucHNpLmNohiJodHRwczovL3VtYnJlbGxhLnBzaS5jaC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBSycOrbvoq6pE/JYBQQAso92I6NXDANBgkqhkiG
+9w0BAQUFAAOCAQEAfarU3Y9Fi2+2Om89eMvkGB/29lZZnR+7w78sVyu6dZlMcJzT
+SJPNQXVbqAJfPEQLmSxBXxVwvoqEJH80c95xjt59p3CMuXKMxGZ+elpCin9fePrP
+pDkU/CXfNNSU1OIZnSttk6Yh6uQ814ZtxqZES1zDP63Ajm/aM9L2mrxD1UJ2OWAh
+RMaDxuEU6fZCZk9ej8os9Kf2k5XmJ8x5v9cJJ3dXFxEz7tGhb7wMSBlFIsdt+j3l
+mB0SSH6Wh64W+Tkwp4HES9XCdEWbuSeJEO+0MEC8kBR13YlXLIsGU95Q5694eeun
+jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
+
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Umbrella Test Service Provider</ServiceName>
+      <ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">psi.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.psi.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.psi.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Björn</GivenName>
+    <SurName>Abt</SurName>
+    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
+    <TelephoneNumber>+41563103509</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Björn</GivenName>
+    <SurName>Abt</SurName>
+    <EmailAddress>mailto:bjoern.abt@psi.ch</EmailAddress>
+    <TelephoneNumber>+41563103509</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/va-idp.lanet.lv.xml b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
new file mode 100644
index 00000000..6752d7ce
--- /dev/null
+++ b/swamid-interfederations-2.0/va-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://va-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://va-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - VA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.va.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
new file mode 100644
index 00000000..ce9ecce7
--- /dev/null
+++ b/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vea-idp.lanet.lv">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
+IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
+FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
+ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
+yOWlzJ0viw82thKw8EOzYCZZMFDK
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vea-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">LAIFE - VEA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Ventspils University College - VEA IDP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
+    <OrganizationURL xml:lang="lv">http://www.venta.lv/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>ITserviss</md:SurName>
+    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
new file mode 100644
index 00000000..099a4f60
--- /dev/null
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
+        <mdui:Description xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ufrpe.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ufrpe.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.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">ufrpe.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <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
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.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">UFRPE - Universidade Federal Rural de Pernambuco</OrganizationName>
+    <OrganizationName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ufrpe.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Fred Medeiros</SurName>
+    <EmailAddress>coord.suporte@nti.ufrpe.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vvc.niif.hu.xml b/swamid-interfederations-2.0/vvc.niif.hu.xml
new file mode 100644
index 00000000..96bdff14
--- /dev/null
+++ b/swamid-interfederations-2.0/vvc.niif.hu.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vvc.niif.hu/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>vvc.niif.hu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDpjCCAo6gAwIBAgIJAMjwevTdUaFoMA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxFDASBgNVBAMTC3Z2Yy5uaWlmLmh1MB4XDTEwMDIwMzExMTA0NVoXDTM3MDYyMTExMTA0NVowQDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEUMBIGA1UEAxMLdnZjLm5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoona+rrWD+FiNj++BK8vn/dQyMCteRKU4wa8ZTNycUjoP26eEOkBw6oqrnw1qyw3oKKUVfCEiIIlfXg9nJ5qMo7NTYKe/IlanYC+uGMTmT8DjgTH9fpA/8CoNjssuyAOhh0oEGdWoPcCd89K+II8uF7Fjz1EhP3WRhWfDTO+mfytMj4qwzV2oLUOfePt7LYMXNNoPkWAPa5bar/z0Nl244NjChWvSsM73r23yh1LTCmSH9Lhpotx/k+wvQybhraDhOE57NddmEL/5ylhX91Trsi32ukNO2XG4Ndbm5voonxeVRfB6j1rMa51SwEvTZkmDSThx7rvvzZ/f6x/9WdjDAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFLwrQAopwhLyqnRtc3BcA1NQJZaBMHAGA1UdIwRpMGeAFLwrQAopwhLyqnRtc3BcA1NQJZaBoUSkQjBAMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRQwEgYDVQQDEwt2dmMubmlpZi5odYIJAMjwevTdUaFoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHx0XxnnnmJztT/UEOrQ0nvR3NTGYJijfG68/bovwtrXJB+9plWTYyWyIeysddciTSgmaaVnGFw9jj8HtpuAvf3N5mKr6bELP8z7lhGa/WxKgjjv/ETTflNOCf8tkhxFJeSJC/Y03MOq+Xqb+6ZzriJIVNYhKDOxR+6inftRQSJ2NWmbgwurPYE/CpvqtDTrXeRnweZ1qAjWzKBswU5Un5mnPxcBPOoBuXtf3hhZU8/u4oXEBBQrsX0BsAFmY6VsJKO/UNB+AtAajgMZbngFXKBUCKDhSwmFUNjLda2MtF6WmuCUuMgQsdV6d/pp47VnVpkLLCVTNunYA/WvlS+G5kU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+    <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://vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="hu">NIIF kollaborációs portál</ServiceName>
+      <ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</ServiceName>
+      <ServiceDescription xml:lang="hu">Elsősorban kutató-fejlesztő csoportok együttműködését hatékonyan támogató infokommunikációs szolgáltatások gyűjteménye (voip, web-, és videó konferencia).rn </ServiceDescription>
+      <ServiceDescription xml:lang="en">Community and support portal of NIIF collaboration services, which provides tools and information to access NIIF collaboration services like VoIP and Videoconferencing (MCU booking, videoconference recording, streaming, etc.)</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="affiliation" 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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
+    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>NIIF AAI</SurName>
+    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Video Admin</SurName>
+    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Video Admin</SurName>
+    <EmailAddress>mailto:video-admin@niif.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index a017526a..d7e6e2a4 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>
@@ -170,12 +174,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 +201,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/webinar.nordu.net.xml b/swamid-interfederations-2.0/webinar.nordu.net.xml
new file mode 100644
index 00000000..46d23a2e
--- /dev/null
+++ b/swamid-interfederations-2.0/webinar.nordu.net.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webinar.nordu.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webinar.nordu.net/Shibboleth.sso/WAYF/wayf.swamid.se"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/ds.swamid.se" 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://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/ds.sunet.se" 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://webinar.nordu.net/Shibboleth.sso/WAYF/idp.protectnetwork.org"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+      <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://webinar.nordu.net/Shibboleth.sso/DS/nordu.net" 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://webinar.nordu.net/Shibboleth.sso/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://webinar.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>webinar.nordu.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=webinar.nordu.net</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAOOLN7U/T/soMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXdlYmluYXIubm9yZHUubmV0MB4XDTEyMTAxMTA3MzUzNloXDTIyMTAwOTA3
+MzUzNlowHDEaMBgGA1UEAxMRd2ViaW5hci5ub3JkdS5uZXQwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCkHGDzNHGHWdCZ8xkrLKElxJmO1uWZ5+GAr46J
+4x+xYdhTUEHr1Jy+G6l+4SPFSV7wtXE5g5LWaLyWqb3zC5DeWRU9PNxGAZ6FcGMK
+6KM3ZAmvx/FmJnD1cDrAo3duI0qt9mr1bAZLv3JIRSXwKV77x5qRhfA6D2ZVXe+j
+J/TtrlqiSkAANNQZFF0lkyITi2WKkN/5nAW9NyqZVNYVcpl5+yilQ7W5wdBJQFg5
+i7vQT/1WvPlpPLB9xOK8mukf4q0EJk6Geqt0tLG4kPkTEWs4PAnyeB0z7kg8vemy
+0gKBj+1pB8TDz0LTx4fSN944UfnHmRKdQSQnCTdA6YbLKLQTAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXdlYmluYXIubm9yZHUubmV0MB0GA1UdDgQWBBQBb9YMEUHgM4WU
+OlNGdlSA6gB0ATANBgkqhkiG9w0BAQUFAAOCAQEAFBir0eA2EEqSQXEYjF0Zr3bs
+tbkwFFL05JuIliuHv6It9Cxo6D+/B0eylFvGQeC6lvH6l1DI8SreYrVsVu4NOMbP
+VcKD7hHqYQPIJAM7I68nwyQq6cTeydqZcwe16x6vnEk0v0QyURMAFlFotZtYAMhh
+M/V1YBDfNPXMh3BYl3g6lxG5qdqYbEoNXrnrMwV6N0BixrjBmoI7K2cEUWW9pwQ8
+rZSHynfzD3dUndFFJVNzwQKyGttlsQGxS0CL5jZS0cWz/p9uvOz+kf4CEqS9QA7o
+euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webinar.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webinar.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Webinar Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">NORDUnet Webinar Service (Adobe Connect)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.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:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet NOC</md:Company>
+    <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 14fee192..5fa87a74 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,19 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
-      </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
+        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=eh@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=WebLicht,OU=DSPIN,OU=Seminar fuer Sprachwissenschaft,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
 RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
 YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
@@ -44,41 +98,38 @@ YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
 +Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
 kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
 NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
-wN2yHSwHNNMiiGY=</ds:X509Certificate>
+wN2yHSwHNNMiiGY=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-      <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Zastrow</md:SurName>
-    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">WebLicht</ServiceName>
+      <ServiceName xml:lang="en">WebLicht</ServiceName>
+      <ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+      <ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e60</OrganizationName>
+    <OrganizationName xml:lang="en">e60</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Tuebingen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Thomas</GivenName>
+    <SurName>Zastrow</SurName>
+    <EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Department of Linguistics, General and Computational Linguistics</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:webapplications@sfs.uni-tuebingen.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
new file mode 100644
index 00000000..3f8c5a81
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin.uu.se.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblogin.uu.se/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Gemensam webbinloggning för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:Logo height="50" width="50" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>uu.se</mdui:DomainHint>
+        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
+        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
+        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
+        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
+        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
+        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
+        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
+        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
+        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
+MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAIag2ZIg3gkA4LMqyU2fUtoGVTW1MA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDndlYmxvZ2luLnV1LnNlMB4XDTEzMTAyMjEyMjIxOVoX
+DTMzMTAyMjEyMjIxOVowGTEXMBUGA1UEAxMOd2VibG9naW4udXUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNjYagdexM5SeQsnG410D2/9el0tGH
+FL+LaDPQ2nLVWAMfYrn0PfEQ7WGG4Glpi1cAjIAG5Qq/8e05shDQ2dRFNx95wfL6
+245X3Hgroqmg4ki6VX0WOwcrBYKybRgQ6Ba9qQuhzFp1yBzD+3XlBmfOClKYkdt0
+wYsYKoA+CvmVIyy22SCh0b4qCsr+gCeCZan3zUsfQrV4Xo6aYVye+eXzZFrICwxG
+Ni8s6xfaxjL6xMEoV2ZqiRa8FUiOQBENxLRA0bGU6JuGT5i9hFu4HliRlnj3h98+
+EEb0QWDf2yrjX01IMflfWhnSiYuUXYLUvFhjTOdTlZqzjDfDpI3dAmNfAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDndlYmxvZ2luLnV1LnNlhiVodHRwczovL3dlYmxvZ2lu
+LnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBROWOq2WSHlPf+65TyF1Ccg
+DawzRTANBgkqhkiG9w0BAQUFAAOCAQEAdCIFbW6SF9+FDVJwmFiy6AEmIS9Z0ME6
+cdt5ZXpsTVwlWw3dOiPWKjOxV0V/7y/Fmj8amZIWsy1NqMSqLseObiXwVp+nh0Jw
+7qQYO85+bHMSYsr8w8a9fbu+/MeehOEDawD1QC2+AmuSTB2zt1GPcvE83XGaq83G
+zpE/7CP1aFhJGZFlxIjN6h7d+KK0vmmjH9CIcXlbFYSy3Njq4SNizc4LwNNMFYjB
+XdPKcIAfaBUhhrQbpNV/fA9AGHCp5XXIpmSfCuR+iTQyk18fj/w6szSm1zyccO3Z
+MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">UU</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala University</Company>
+    <SurName>SAML2 admins</SurName>
+    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>Uppsala University</Company>
+    <SurName>SAML2 admins</SurName>
+    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala University</Company>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>helpdesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184717890</TelephoneNumber>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
new file mode 100644
index 00000000..f3c531d7
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin2.geant.net.xml
@@ -0,0 +1,115 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Intranet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides access to GÉANT project documents, meetings and important information.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
+						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
+						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
+						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
+						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
+						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
+						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
+						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
+						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
+						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
+						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
+						2IOi
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
+						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
+						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
+						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
+						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
+						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
+						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
+						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
+						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
+						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
+						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
+						BDy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.geant.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <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>
+      <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="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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>DANTE IT Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE IT</GivenName>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz.xml b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
new file mode 100644
index 00000000..e0dfb5e0
--- /dev/null
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://whoami.cesnet.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for CESNET employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance CESNETu.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ces.net/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.cesnet.cz/</mdui:InformationURL>
+        <mdui:Logo height="88" width="200">https://pki.cesnet.cz/_media/cs/cesnet-logo-200.gif</mdui:Logo>
+        <mdui:Logo height="177" width="400">https://pki.cesnet.cz/_media/cs/cesnet-logo-400.gif</mdui:Logo>
+        <mdui:Logo height="353" width="800">https://pki.cesnet.cz/_media/cs/cesnet-logo-800.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
+WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
+DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
+BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
+saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
+vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
+2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
+ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
+sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
+HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
+ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
+ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
+9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
+i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <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://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC7jCCAdYCCQCRzSvIiTLzPDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJD
+WjEPMA0GA1UEChMGQ0VTTkVUMRkwFwYDVQQDExB3aG9hbWkuY2VzbmV0LmN6MB4X
+DTExMDYyODE3MTUxNloXDTIxMDYyNTE3MTUxNlowOTELMAkGA1UEBhMCQ1oxDzAN
+BgNVBAoTBkNFU05FVDEZMBcGA1UEAxMQd2hvYW1pLmNlc25ldC5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALVaOoSPi3RrWjAIk9qneCw48UDTRqsZ
+saD3YGWGpUzigUqAIFgNewH4gFyZskhgeUB185iBCgsb5+oiNwdGKvm0dSRS8qlo
+vjzbeBP7sSVbgmOeeRy6W9AD8cA7HMrrHXxLn7LFGk2czY+dtEWkA0CFVYOR/JGX
+2a8g0YfHqRypU7DKqoo5feB7eUclzwhiZ9jsjqbE//M3LUk/QPIbxfimB8XFY7tV
+ijdFXkmSyz84FDZhCQ4eypu5Pn6+ov4BF/MXZGjFSsBbUKWL4UDAyL+y7LlzvsZq
+sJ4crixV7D3+ChkCaimW2+ETRZF/3F7c52SiqIgjCnvUV90ttGqQWrsCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAjxVz8kXKKtoM449sxOGg1+pp/rio4vUpZ//nSfwf
+HnbZdesPoLoE58o+U5E3+e5hcN9jRbOEYyFt1oR9uTmYyo19G6CARvN3HNbUL5dW
+ID4yEvYy54tvokxqWNisk5NtXgOmOD+U2NX0FwAkoCDYOKboASeZ5PTQ5uvIo2Cm
+ljL8VHxgCZ+N4/UYnz3xAiJBKXCFLNgTMVIM2HKNYioKUqxubVDapR9E94vLzuvs
+9NVKKQfcm4DAMfylJKBLMGFNdqNwiFmczxxkOr3Me+vn+Tb7XRzT1tSmQkwilpmY
+i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CESNET</OrganizationName>
+    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ces.net/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ivan</GivenName>
+    <SurName>Novakov</SurName>
+    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Jan</GivenName>
+    <SurName>Tomášek</SurName>
+    <EmailAddress>jan.tomasek@cesnet.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
new file mode 100644
index 00000000..b5590de0
--- /dev/null
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T13:14:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">WIFI - GARR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI - GARR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>wifi.dir.garr.it</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=wifi.dir.garr.it,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
+                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
+                            Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
+                            u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
+                            kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
+                            ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
+                            FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
+                            uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
+                            ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+                            R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
+                            BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+                            AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+                            MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+                            cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+                            ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+                            c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
+                            BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
+                            43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
+                            UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
+                            T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
+                            3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
+                            Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">WIFI-GARR</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Wifi access for guests</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">Consortium GARR</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>system.support@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.edugain.org.xml b/swamid-interfederations-2.0/wiki.edugain.org.xml
new file mode 100644
index 00000000..f1104ea4
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.edugain.org.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.edugain.org/shibboleth" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1: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://wiki.edugain.org/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.edugain.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.edugain.org/eduGAIN:Privacy_policy</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="en">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</mdui:Description>
+        <mdui:DisplayName xml:lang="de">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dieses Wiki enthält Empfehlungen und Anleitungen um Webdienste für eduGAIN anzupassen.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">eduGAIN Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Ce wiki met à disposition des recommandations et instructions expliquant comment intégrer des services web dans eduGAIN.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC9zCCAd+gAwIBAgIJAMU9QRxFmNAuMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHdpa2kuZWR1Z2Fpbi5vcmcwHhcNMTMwNzA0MTAzMTE0WhcNMjMwNzAyMTAz
+MTE0WjAbMRkwFwYDVQQDExB3aWtpLmVkdWdhaW4ub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAnspkp3AJPuXFtIhJc3XTBKG8xF3Qk5CMvmDercSB
+iBBJrQXsAKY+wEzZkH3gc3kFDP5J0uLHQ0wjZhwL5F7XBcqiIvbavIRtcxqVLGwQ
+bySVZOfWimpm9LSguiJciJv5dPqhIyMHHkExhi6WLlqY9Am3vkvep5th7nZJ/Idt
+XMMb+PkhSfmQRoZyZGh5n7nkbY88w3DHH9+i1HbyaCNS/+m2/BxQarEKWEWMngcm
+yZX+eAY70QX8O9p3RTS3PT8fhgXp+gbCQWec33c1dbC37RZZQg3Iku4qlZIQc4ER
+SCIkFF4x0qSCPjwDVHX2d2UypHJnbve2tKahUeOyXhtGEwIDAQABoz4wPDAbBgNV
+HREEFDASghB3aWtpLmVkdWdhaW4ub3JnMB0GA1UdDgQWBBQmj8sgTfdCBiqStP+T
+QyNcyrFNRTANBgkqhkiG9w0BAQUFAAOCAQEAXSa71FEzhRl0gbcHK3cKI/8SRsuM
+BSJJNS/3fHQgr3q3Kozffd5r8i1sVQWd76FqjmN2ueqkYBT0XAAFTnvWUnhzSX6o
+ZR7cNBsibRZHqbMQPOnxWk2IKafGT8HG+BTX/TD6ghX8OXbixuB9I+n9jNTphFGi
+XklReN3a7H5LfzJZNw/IsEt/iII3vM0C3CG4udft7vPHUxoz/sg7vLB1QI5oCIKQ
+czsnN6gKOhE3R9xBXmXEAe+7t0j+xUllfMpzN1visnwJfrBqmPxWZtoAofjZBUxy
+nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
+          </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>
+    <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://wiki.edugain.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="en">geant.net</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <GivenName>eduGAIN</GivenName>
+    <SurName>Integration</SurName>
+    <EmailAddress>mailto:edugain-integration@geant.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>eduGAIN</GivenName>
+    <SurName>Operation</SurName>
+    <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
new file mode 100644
index 00000000..5785126d
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.shibboleth.net/shibboleth">
+  <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"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-06T16:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS"/>
+      <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://wiki.shibboleth.net/confluence/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/EDS" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Login" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Shibboleth.net Wiki</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The wiki hosting the documentation for Shibboleth.
+					Unauthenticated users may view the existing documentation. Authenticated users
+					may create new documentation pages and edit existing ones.
+				</mdui:Description>
+        <mdui:Logo height="82" width="64">https://shibboleth.net/images/gryphon_64x82.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDQjCCAiqgAwIBAgIJAMI1r/DZzTEJMA0GCSqGSIb3DQEBBQUAME8xEzARBgoJ
+						kiaJk/IsZAEZFgNuZXQxGjAYBgoJkiaJk/IsZAEZFgpzaGliYm9sZXRoMRwwGgYD
+						VQQDExN3aWtpLnNoaWJib2xldGgubmV0MB4XDTEzMTEyNTE0NTcyOFoXDTM3MDMw
+						NDE0NTcyOFowTzETMBEGCgmSJomT8ixkARkWA25ldDEaMBgGCgmSJomT8ixkARkW
+						CnNoaWJib2xldGgxHDAaBgNVBAMTE3dpa2kuc2hpYmJvbGV0aC5uZXQwggEiMA0G
+						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1viMiWhYa8cmxJ6rQ8yORYMD6Gx5n
+						r/r9wQko+Tbjl/qGS0LaTfPQCokvwrD06506MPHainaMqbjlO4gDjq2LpU9/iy0s
+						iLuY7UHgDqNNZOELBTQOMwLAFcuEA10FCWjJRglT+6w3xEFeU+dZkBXV1VvKBvsZ
+						SiuQw437CcV3ueEF4+ZB0l9uyq8o3wzKRZ9DnpyFL7SUJiHJPuqqXZuyQnjLrbVZ
+						KjjumGnY3LJTUo1xoUEuhqj5RMfspn2oc5YnIYka5YrCBmYKJV3QtCFbLA/cz8nF
+						m+lOvYGz8nl3wHNkZIVRoetVw/Mhf7lzex0rh3XBdS6vVcT75uH0X1OPAgMBAAGj
+						ITAfMB0GA1UdDgQWBBQe1XwZavrgAhRXrfhv1gGUwSkc7DANBgkqhkiG9w0BAQUF
+						AAOCAQEADCGhWJ+oZ8ltcjJ7D66rMg1HOZT6GFCVeZ7MfhY/KFrvsnITNbTA+SgZ
+						tCJt/BLlZXxpzmix19bD9bNwqEMo7WSqBy77X7SS97ZXti6y6vwAz8h78vzQopOd
+						rnn8XXyWxtrtRRCK4RMpZGrVm3sfBPW68j9hiPHZqewE4nLavjCki/I9rCMe5dJE
+						3+ZRf4Ip/9hYqM+a5Chcvbo2zJEOtw+EUQqNTZ51j33H/2qF9UoSpt74UFh+Jd5y
+						L2GoFSt/gCld78j/7cU3ObGQEme+hVVZ8/uGa/cCYvFt75vNBdnlj4icZ6fgFe9R
+						9h5hlBTGD3PULSFmCdkgxtwIyd855Q==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SLO/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/Artifact" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.shibboleth.net/confluence/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Shibboleth.net Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">
+				The wiki hosting the documentation for Shibboleth.
+				Unauthenticated user may view the existing documentation. Authenticated users
+				may create new documentation pages and edit existing ones. 
+			</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"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Shibboleth Federated Wiki</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.shibboleth.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Shibboleth.Net Technical Support</GivenName>
+    <EmailAddress>mailto:contact@shibboleth.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott</GivenName>
+    <SurName>Cantor</SurName>
+    <EmailAddress>mailto:cantor.2@osu.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ian</GivenName>
+    <SurName>Young</SurName>
+    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki2.redclara.net.xml b/swamid-interfederations-2.0/wiki2.redclara.net.xml
new file mode 100644
index 00000000..a1f6a97c
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki2.redclara.net.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki2.redclara.net/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2014-02-21T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">http://cofre.reuna.cl/index.php/es/reglas-federacion</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="1"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki2.redclara.net/Shibboleth.sso/DS" index="2"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Wiki - RedCLARA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RedCLARA's Wiki Service</mdui:Description>
+        <mdui:Description xml:lang="es">Servicio de Wiki de RedCLARA</mdui:Description>
+        <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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
+WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
+S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
+KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
+S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
+Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
+phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
+7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
+uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
+eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
+dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
+OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
+U/M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>redclara.net</ds:KeyName>
+        <ds:KeyName>wiki2.redclara.net</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
+WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
+CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
+hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
+S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
+KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
+S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
+Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
+phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
+awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
+YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
+AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
+aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
+Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
+b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
+IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
+YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
+dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
+AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
+ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
+L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
+LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
+7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
+uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
+eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
+dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
+OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
+U/M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedCLARA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.redclara.net/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Authentication Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical Support</md:GivenName>
+    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mark</md:GivenName>
+    <md:SurName>Urban</md:SurName>
+    <md:EmailAddress>mark.urban@redclara.net</md:EmailAddress>
+  </md:ContactPerson>
+</md: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
new file mode 100644
index 00000000..09b5958c
--- /dev/null
+++ b/swamid-interfederations-2.0/www.knodium.com.xml
@@ -0,0 +1,67 @@
+<?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">
+  <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>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.knodium.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.knodium.com/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Knodium</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Knodium is an online platform for collaboration.</mdui:Description>
+        <mdui:Logo height="158" width="350">https://www.knodium.com/images/logo-shib.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIC9DCCAdygAwIBAgIJAMLknMjt03SjMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+						BAMTD3d3dy5rbm9kaXVtLmNvbTAeFw0xMjA5MTAxNTI2NTZaFw0yMjA5MDgxNTI2
+						NTZaMBoxGDAWBgNVBAMTD3d3dy5rbm9kaXVtLmNvbTCCASIwDQYJKoZIhvcNAQEB
+						BQADggEPADCCAQoCggEBAMS5B0GMXiaYkvtJDFNsrRNMfFF5WZOTdOdFh4VK2G1C
+						c4Jo+WInPbjfB+l3gNji634Qc06ke0A74GyRTf19pIcKpmB6pyEtjt/0vgInT3Ax
+						ZI38HVgCk1WHwpg5LLzRI4FkzpIIX/SfB7KYB6WDA0AXbE8id2KXaxuCNrGYvoU6
+						orz7Gt+FERDUooNli1Z97ZQ6o6MogAeHizRTpWhWVqIVLKxvAZ42+OXw2OwGzOeL
+						OkefcJ5l/AwJbmEM+19yqdSB4e6VqF+ApsR/NbJaE5kz7GhvitK0FWkrP31bVj5t
+						0pFmyFwYRohge0FFw0wX/vojPZqqBjOM5HafUmDB4PUCAwEAAaM9MDswGgYDVR0R
+						BBMwEYIPd3d3Lmtub2RpdW0uY29tMB0GA1UdDgQWBBQysHs0AHbWoM4U7GlNVirq
+						6w1N4DANBgkqhkiG9w0BAQUFAAOCAQEAY9843vk3HlJssWlGnq5djjjzOeMZ6qPa
+						GXNZBZGi9LI3P4xAkW0fCnUygcb5MZaHdB+RuINEdXj+npITszfLtnj2m4BCq2IN
+						evmRUQRc7F27b9aoUuhYl0q6/Z9MFOjdjzQb6LT1duCDPq83kFp0gS57fqQP97F0
+						8Hbzw5ZdLWALzsDuxU9FGRU5gdZNDmXkzymluKMZRchLuJrJhsRDPb34xmcH7RKF
+						Msv4N8MBOk9nESf3jQTPgkCvZee2t6h9xijoRP+IH5VD3hfq+H3lNKX7w7DkRqlR
+						dB55/ggB6okN6t5L8d+FUbKU3qI8VQmR8V4/NJ/F0EFmLzEklMUxsw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.knodium.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.knodium.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.knodium.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.knodium.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.knodium.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.knodium.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.knodium.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Knodium Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Knodium</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.knodium.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Web Support</GivenName>
+    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Web Support</GivenName>
+    <EmailAddress>mailto:webmaster@knodium.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
new file mode 100644
index 00000000..c73ffb5e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-12-04T15:23:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Meertens Institute Archive</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="de">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.meertens.knaw.nl,OU=Meertens Instituut,O=KNAW,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAOmcTE0k6Yoag8eNrOUGhicwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjEyMTcwMDAwMDBaFw0xNTEyMTcyMzU5NTlaMFgxCzAJBgNV
+BAYTAk5MMQ0wCwYDVQQKEwRLTkFXMRswGQYDVQQLExJNZWVydGVucyBJbnN0aXR1
+dXQxHTAbBgNVBAMTFHd3dy5tZWVydGVucy5rbmF3Lm5sMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtqF1CkCgz6bB3dv5bTYBRCSwWqgoZActFvigdJsa
+DopFIIh+3agGBfmCI4WCb3rAluCw2LYl8mdUaRIXNDr3TkkGQP5Q+pKDHFTd1n0L
+TLs7PdTWOG61E/ExIfwTmphUvcrshazJk5xCbFBRbrWFNf/349Anf2ze1mUDBSdl
+vRTTyuYcckJKV7OHMnOh3+EsCHOkX1KsOwyhQKfmtpL7n/meIPkF9KwFocsxTjNx
+inZDHxTmikjzr6kguu5grEIeXbbA1mfO0AHVGiaXRyvNDl+EoX7IqEKJQbbIKwpd
+h1t/CHvZ/PFWdyM8K4IuDdImD3sjoYCg78yLHnR0lJJ8twIDAQABo4IBZzCCAWMw
+HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOPgQ/s6
+AVKL7kI1LBCGTOSGGWk0MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
+sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
+aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
+BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHd3
+dy5tZWVydGVucy5rbmF3Lm5sMA0GCSqGSIb3DQEBBQUAA4IBAQA9ZZaYfsUQ5/9d
+uqDpjUaKPkXOfyKUNllh8mInY/LE8hWp+M3L4i5iiAkFkyp+v/d07AZDR0r0F7Jp
++8hEY6HdP5+sdcTzlk6E3QezOmTAIUVcSNYLPuqyvyx0hmGZR1S4z+vYqTNyQMW1
+2L/MYOCTUdwruEmqyBR2goNyq0k6K3l5vh6TqV20E45SzpB2JEGRTIPWt46cRJNx
+wmpzyA4aXLGH97Z8DFjC2hi1bazaVr9E109r0NMXO/8yaLtc0Ok/vWHLUPB4TLCP
+HI6pYTwazmo1x3l7TmGhmhEcVc1JCN0ByVLWB+DvzXsCxYtDItsHPXj2MVPnqMJo
+GTLw7jCk
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="10"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Meertens Institute Archive</ServiceName>
+      <ServiceName xml:lang="en">Meertens Institute</ServiceName>
+      <ServiceDescription xml:lang="de">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</ServiceDescription>
+      <ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture</ServiceDescription>
+      <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e235</OrganizationName>
+    <OrganizationName xml:lang="en">e235</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>KNAW</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:servicedesk@knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Marc</GivenName>
+    <SurName>Kemps-Snijders</SurName>
+    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
new file mode 100644
index 00000000..ec8a588e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.portal.euromonitor.com/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-22T16:58:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
+						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEHDCCAwSgAwIBAgIJAJuSt635KQAmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
+						VQQGEwJHQjEYMBYGA1UECAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25k
+						b24xIjAgBgNVBAoMGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsM
+						AklUMSMwIQYDVQQDDBp3d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMDEy
+						MTAwNjIyMzJaFw0yMDEyMDcwNjIyMzJaMIGOMQswCQYDVQQGEwJHQjEYMBYGA1UE
+						CAwPR3JlYXRlciAgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xIjAgBgNVBAoMGUV1
+						cm9tb25pdG9yIEludGVybmF0aW9uYWwxCzAJBgNVBAsMAklUMSMwIQYDVQQDDBp3
+						d3cucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+						ADCCAQoCggEBANY09Jl65SJ1NUm1lrht4U2e4NAB0nnoM9YrTlUCwfqljmSRbbNc
+						YVpCzfjop/Z956K2ePUnrVCY6vGXBlAxUBf8ugMek1JfK1lYH+USogWbQ38iNH/W
+						BmN7MI+ZH76nRZ3bcWnSk16suus5mmNd5FZVbdpUcW3Vhi7ZHmAHtwQySJLvxAMs
+						uYGAqVcxPGBZjrG1C6nvPR22I51Tli7nh8uFziCaWmUAjLnyU+k/1GXHsWip9YPu
+						zgXe699GsPcb8GfPLCKfOnL/qNa1dU7vVD6MRz/egKri1djGgWQPYXAIs/F5cfl3
+						t2UC0+1VmSricGkN88tz+bQAA0PpGeLmVDECAwEAAaN7MHkwCQYDVR0TBAIwADAs
+						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+						VR0OBBYEFJDmPtO/5kuHAA1GkiygcECQIgM+MB8GA1UdIwQYMBaAFJDmPtO/5kuH
+						AA1GkiygcECQIgM+MA0GCSqGSIb3DQEBBQUAA4IBAQCwDNd27UiliU2+jRit019f
+						eAz1mpoC4Bxq11rvUyuqWmIdEZC60riLxsTmukGWRI0TnGTPt2oVKr2y8luT7RZF
+						CItFWKcxS6yN4BHSMp3bj6LAgk/KrwpGWu3pKG4rVtfDjrRwjX54f/hF+DPViSbD
+						UcO/MiPwHo9+Ooj8OrLrwpsotCqwCaEnLrjpR4Vw5Kc510tNuca2MVD7Ppkh1+vx
+						BX00Mf1vU2OadW3VBlMyQuzcvpB6oon/pCbOVYJ+vsI4mNIJ27tNI66urifUwtby
+						6N7Wsak8uoAFS1GACPsJ/az3sQsUvTOy3FFrJOUkTUK1ReErc5jHS67YdLT1cHy9
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/shib/art" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/post" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.euromonitor.com/portal/oa/auth/rcv/saml2/art" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.euromonitor.com/portal/default.aspx" index="6"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Euromonitor International Passport System</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Jurgen</GivenName>
+    <SurName>Wiehan</SurName>
+    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Jurgen</GivenName>
+    <SurName>Wiehan</SurName>
+    <EmailAddress>mailto:jurgen.wiehan@euromonitor.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es.xml
new file mode 100644
index 00000000..eac93c8d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Universidad de Málaga</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Universidad de Málaga</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Universidad de Málaga</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
+    </md:Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
+  </AttributeAuthorityDescriptor>
+  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Malaga</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universidad de Málaga</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk.xml
new file mode 100644
index 00000000..3b288ae0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.scran.ac.uk.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.scran.ac.uk/shibboleth">
+  <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"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-14T15:54:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Scran</mdui:DisplayName>
+        <mdui:Description xml:lang="en">370,000 images from museums, galleries &amp; archives. All resources rights cleared for use in teaching and learning.</mdui:Description>
+        <mdui:Logo height="109" width="350">https://shib.scran.ac.uk/images/logo-scran.png</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scran.png</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/glow"/>
+      <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.scran.ac.uk/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.scran.ac.uk/Shibboleth.sso/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.scran.ac.uk/Shibboleth.sso/DS/UKFederation" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEpzCCA4+gAwIBAgIJAJr9uyuwy/Y2MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
+						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEP
+						MA0GA1UEChMGUkNBSE1TMQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jh
+						bi5hYy51azEkMCIGCSqGSIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrMB4X
+						DTEwMDIyMjExNDU1OVoXDTIwMDIyMDExNDU1OVowgZMxCzAJBgNVBAYTAkdCMREw
+						DwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdoMQ8wDQYDVQQKEwZS
+						Q0FITVMxDjAMBgNVBAsTBVNjcmFuMRYwFAYDVQQDDA0qLnNjcmFuLmFjLnVrMSQw
+						IgYJKoZIhvcNAQkBFhV3ZWJhZG1pbnNAc2NyYW4uYWMudWswggEiMA0GCSqGSIb3
+						DQEBAQUAA4IBDwAwggEKAoIBAQDEywuow7F7KjwlfTa4vj/2QWvtexIy+OO0hWvn
+						SJ8B3goDjqaC7Mv1fNJdxtZMl/kR6ZfMT86Xa2VfK47NOe14jJDgZxN/0lbwsLwb
+						GyyxcZeDg0NCcv/jFKUiH6m2jSLkpSrSTHuUqRUhGpR0wcr3+HZjLZrpHI0FQ5EH
+						cnkhg1fYwZ5Z6vth+0NhZt9HjWLrUtia4Bj0orj0MkUAKlGEBudrPsC/OITO9oUp
+						pXV0PBi0hILJdbgeJXDFhxfcEpCczQlQgdx/KWD6q/6nSOmT9hNGMjkiprn/w/q1
+						SsAMRqSfrWrR6q8hWTkWmNsm/c39bJFuMvkfkiOgvvBVqE3nAgMBAAGjgfswgfgw
+						HQYDVR0OBBYEFG8UIQ7Hc9WHtlS6PKYYP/7RWNcrMIHIBgNVHSMEgcAwgb2AFG8U
+						IQ7Hc9WHtlS6PKYYP/7RWNcroYGZpIGWMIGTMQswCQYDVQQGEwJHQjERMA8GA1UE
+						CBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDEPMA0GA1UEChMGUkNBSE1T
+						MQ4wDAYDVQQLEwVTY3JhbjEWMBQGA1UEAwwNKi5zY3Jhbi5hYy51azEkMCIGCSqG
+						SIb3DQEJARYVd2ViYWRtaW5zQHNjcmFuLmFjLnVrggkAmv27K7DL9jYwDAYDVR0T
+						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWSSnSaVz28lDBISUNRmNJFwKvjo5
+						nC4+WM7h6Tg9QbC/EYNCwkH7bOoEcCJs28jn0EwRfn4GUgc1LFkf9UYc3rJ+mihD
+						+RZDHjaJSZDbQgZI55y8dpuYT8r70rCg+xtq1Iwv0NzcM+Q/3cEeiMlIXY6YFAAA
+						Dsp1/4NlItMUs6ZwAyMLjyIlSjIHjTVLI2bRTDlY4nUgZhqz4spvqDtnmq7PERUN
+						LTUxK70J8DSNHEuzC8s+rTfXhsn01ZUKGDQqeFDO3TccF/x8iespeHPJO7uD/klz
+						bjQPf6gJKSkRW/uiwoDLkt/CChMGLGbYpQcx/7RpyzUpN4u4PHLduf03kQ==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Scran</ServiceName>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Scran</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.scran.ac.uk/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Scran/RCAHMS Web Admins</GivenName>
+    <EmailAddress>mailto:webadmins@rcahms.gov.uk</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scran/RCAHMS Web Admins</GivenName>
+    <EmailAddress>mailto:webadmins@rcahms.gov.uk</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
new file mode 100644
index 00000000..6b1694cc
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-08-11T14:59:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-erlangen.de</saml1md:Scope>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Erlangen-Nürnberg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Erlangen-Nürnberg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider der Universität Erlangen-Nürnberg</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.sso.uni-erlangen.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.sso.fau.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.sso.fau.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIHCTCCBfGgAwIBAgIHFVh6d4xjCjANBgkqhkiG9w0BAQUFADCBozELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
+BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
+WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
+ZXJsYW5nZW4uZGUwHhcNMTMwMzA3MjA0NzM2WhcNMTgwMzA2MjA0NzM2WjCBpzEL
+MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
+KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNV
+BAsTKFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxFzAV
+BgNVBAMTDnd3dy5zc28uZmF1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAs/qsX/p+z8uxh3feD2sZWdb/NpOI5/YkPeXYQPQAdlRKBijHLohlLRAz
+CNFU7YWhy/FxY4uLE97h0hPVpoxCPlOW5qh56C1ZEWGBdhJImfYpzJbB2UIIUUR2
+WXLjZPyQObzxocui2M3XWa/uhpc3nPvBC/HLzr4fbU0f20D9hr0MXFurfuhGID+j
+t1jRsVWTjMWEVDAXDduKYUCAqrp1RlSc/H6z4WFeiQ92+4Q/+axig6KRkg0e0LBh
+MDA3ozIODmfFDIuo++rGvHWG47GLbLQyJLLeGkPlxxqo8uvVhtENxd5jrIkZrRd8
+y+dFr+jRh36DMmJGTzVkeweZPT2ZpQIDAQABo4IDOjCCAzYwOQYDVR0gBDIwMDAR
+Bg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFGL4MCMuRKr8cD0oslgL7QGRYj+uMB8GA1UdIwQYMBaA
+FPRz8/rGQrPGXGnAWL50OPlhK45iMIHvBgNVHREEgecwgeSCDW9wZW5pZC5mYXUu
+ZGWCD29wZW5pZC5ycnplLm5ldIIec3NvLXByb3h5LnJyemUudW5pLWVybGFuZ2Vu
+LmRlggpzc28uZmF1LmRlghhzc28ucnJ6ZS51bmktZXJsYW5nZW4uZGWCE3Nzby51
+bmktZXJsYW5nZW4uZGWCEXd3dy5vcGVuaWQuZmF1LmRlghN3d3cub3BlbmlkLnJy
+emUubmV0gg53d3cuc3NvLmZhdS5kZYIXd3d3LnNzby51bmktZXJsYW5nZW4uZGWB
+FnNzby1hZG1pbnNAcnJ6ZS5mYXUuZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwge0GCCsG
+AQUFBwEBBIHgMIHdMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWVybGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwUgYIKwYBBQUHMAKGRmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWVy
+bGFuZ2VuLW51ZXJuYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBALIsNWnuaDrQA7Tu1ReusFhrkdOKpIH90mMWOBXZoUTPxEaK
+n86rjUAoFj1u1NlWyUrMYRWneXlvy3jQ3KEo7H6nJiEoa7LH1siTNcmOjDiN1dqA
+PO6+zAiESP5Xwsr2D1msyPXade0ra2PFSeG4XZ6hF/KEEYN0xxFpPbrvBD/fa+MU
+fp8NqxF7uANosdABgJs9RFmEmGuWd/Rc3aGzd3+dGwh9nFnKxON9fTrOlXNxa9Og
+jO0N75bg2RQTXLaMZLlUoVGE7n6FljoKjyiXlvUBSSeErakYPLpvgolN6QwAkM2j
+c/GLdms9imUWk7YQ8hzH7aUxdRWOmXLmc+2n/lY=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e131</OrganizationName>
+    <OrganizationName xml:lang="en">e131</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Frank</GivenName>
+    <SurName>Tröger</SurName>
+    <EmailAddress>mailto:sso-admins@rrze.fau.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vho.de.xml b/swamid-interfederations-2.0/www.vho.de.xml
new file mode 100644
index 00000000..70a02b1d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vho.de.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpvzg">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-02-10T14:50:56Z">
+      <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">vzg.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Verbundzentrale Göttingen (VZG)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Verbundzentrale Göttingen (VZG)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP der Verbundzentrale Göttingen (VZG)</mdui:Description>
+        <mdui:Description xml:lang="en">IdP der Verbundzentrale Göttingen (VZG)</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.vho.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vho.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.vho.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
+WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
+eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
+o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
+I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
+8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
+qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
+2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
+bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
+CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
+ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
++ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
+AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
+onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
+DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
+BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
+Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
+IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
+dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
+Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
+CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/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://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/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">vzg.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www.vho.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
+WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
+eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
+o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
+I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
+8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
+qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
+2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
+bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
+CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
+ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
++ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
+AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
+onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
+DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
+BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
+Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
+IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
+dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
+Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
+CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/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">e45</OrganizationName>
+    <OrganizationName xml:lang="en">e45</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Verbundzentrale Göttingen (VZG)</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Verbundzentrale Göttingen (VZG)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.vho.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.vho.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Franck</GivenName>
+    <SurName>Borel</SurName>
+    <EmailAddress>mailto:borel@gbv.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Gerald</GivenName>
+    <SurName>Steilen</SurName>
+    <EmailAddress>mailto:steilen@gbv.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Till</GivenName>
+    <SurName>Kinstler</SurName>
+    <EmailAddress>mailto:kinstler@gbv.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu.xml b/swamid-interfederations-2.0/www.videotorium.hu.xml
new file mode 100644
index 00000000..b796c735
--- /dev/null
+++ b/swamid-interfederations-2.0/www.videotorium.hu.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.videotorium.hu/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>vportal.niif.hu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAMKdDVZkKR0MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTAeFw0wOTExMjAxMjMzMjRaFw0xOTExMTgxMjMzMjRaMBoxGDAWBgNVBAMTD3Zwb3J0YWwubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOhapHXauA4X/BNSZIhLERDmHjx/7zdw1dxgmkr8GmDzEH1BGZ6/nSdXMAhkrI1HVOGiSz6QhR0l2r6A7mSLXh8u0Sjc3TzCSsAIzz/ygh6Vljl5WMRE9u9uxtkvd+5d4cZP4lUbL9aFOTvNBh3Gizy7oZwWjbp64rSupRNqnz8JFGFPyPnRpXo8HjpNHYeaLyqOqTww9lHTlGWKTqibsyV7CctiFKbADlU2ol/8cdKLiSVAWqlsIed3proxg0fgHskpmyB8cFr77lylFnirJGRXjXMXlVwr1XxlOghfJqBsRxz/wKMXvMNr9sWYoDw14kYBls8S9RCDNF34Fx+UOcECAwEAAaM9MDswGgYDVR0RBBMwEYIPdnBvcnRhbC5uaWlmLmh1MB0GA1UdDgQWBBQgKCZFxt8oR2XfhQ7zGmF7auxUdzANBgkqhkiG9w0BAQUFAAOCAQEAX+R7y/xZi46N65LoxI7OS0a0U9vVh4PxGfylYafbDpPy+FPw1Dh6IqG1R8gt1TSRUouVdoRb9b2k8CjAAkRq4lbF5XctWcsWqMEU69BcUlbzzAtgnpgghVSk8dFlMrEWugQvzd6RL4HDPPrvFsjdMj52+p1mBMtw9SUrazPp+hU1y8zeDdocI2RdyLEhArR5xQVKmV32hDFr754zNdZorvcRuuarkO83b1732Lc//S38m9Co/U1WAPN2sSUN5S7yIZ/EjubTbvf8gcGvEHT1rffoOzqHksfcd+gG9nbNZLO6xZJJEwNwPcOoxEWZXhv3ynvCtFcuvmtcGQazcy0s9Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="6"/>
+    <AttributeConsumingService index="1" isDefault="true">
+      <ServiceName xml:lang="hu">Videotorium</ServiceName>
+      <ServiceName xml:lang="en">Videotorium</ServiceName>
+      <ServiceDescription xml:lang="hu">A Videotorium a felsőoktatás és kutatás szereplői számára létrehozott videó/audió megosztó portál, amely helyet és professzionális megjelenési formát biztosít a felsőoktatási intézményekben, kutatóintézetekben és közgyűjteményekben készített videó-tartalom számára. </ServiceDescription>
+      <ServiceDescription xml:lang="en">Videotorium is a video/audio sharing portal created for the players of research and education. Videotorium provides professional presentation of video content recorded at higher-education organisations, research institutions and public collections.</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"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <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="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="affiliation" 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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
+    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Videotorium Admin</SurName>
+    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Videotorium Admin</SurName>
+    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Videtorium Admin</SurName>
+    <EmailAddress>mailto:admin@videotorium.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz.xml b/swamid-interfederations-2.0/www.vutbr.cz.xml
new file mode 100644
index 00000000..ae19b13e
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vutbr.cz.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vutbr.cz/SSO/saml2/idp">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vutbr.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
+        <mdui:Logo height="84" width="180">https://www2.eduid.cz/idp-loga/vut.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 use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Brno University of Technology</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Brno University of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.vutbr.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.vutbr.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Webmasters</GivenName>
+    <SurName>VUT Portal</SurName>
+    <EmailAddress>portal@vutbr.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.eduroam.cz.xml b/swamid-interfederations-2.0/www2.eduroam.cz.xml
new file mode 100644
index 00000000..1d980d9e
--- /dev/null
+++ b/swamid-interfederations-2.0/www2.eduroam.cz.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.eduroam.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www2.eduroam.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduroam.cz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">eduroam.cz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Informational web of the eduroam.cz project. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
+        <mdui:Description xml:lang="cs">Informační web projektu eduroam.cz, který přináší informace jak pro koncové uživatele tak pro správce eduroamu na jednotlivých institucích.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://eduroam.cz/en/start</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://eduroam.cz/cs/start</mdui:InformationURL>
+        <mdui:Logo height="130" width="300">https://www.eduroam.org/downloads/logo/PNG/eduroam_trans_300pix.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www2.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
+BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
+MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
+MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
+YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
+C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
+AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
+gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
+rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
+X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
+AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
+MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
+A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
+d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
+KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
+aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
+PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
+wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
+NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>www2.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
+          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
+BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
+MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
+MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
+YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
+C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
+AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
+gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
+rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
+X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
+AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
+MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
+A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
+d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
+KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
+aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
+PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
+wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
+NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduroam.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.eduroam.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduroam.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/ECP" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/POST" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/Artifact" index="9"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET, z.s.p.o.</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Tomášek</md:SurName>
+    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz.xml b/swamid-interfederations-2.0/www3.eduid.cz.xml
new file mode 100644
index 00000000..9ccbd082
--- /dev/null
+++ b/swamid-interfederations-2.0/www3.eduid.cz.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.eduid.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <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://www3.eduid.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www3.eduid.cz/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduID.cz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">eduID.cz</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Informational web of the eduID.cz federation. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
+        <mdui:Description xml:lang="cs">Informační web projektu eduID.cz, který přináší informace jak pro koncové uživatele tak pro správce na jednotlivých institucích.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.eduid.cz/en/index</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.eduid.cz</mdui:InformationURL>
+        <mdui:Logo height="63" width="150">https://www.eduid.cz/eduid-logo-150.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://www3.eduid.cz/shibboleth</ds:KeyName>
+        <ds:KeyName>www3.eduid.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=www3.eduid.cz</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDEDCCAfigAwIBAgIJAIxP8cTUiGsTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDXd3dzMuZWR1aWQuY3owHhcNMTQwMjAxMTc1ODA1WhcNMTcwMTMxMTc1ODA1
+WjAYMRYwFAYDVQQDEw13d3czLmVkdWlkLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAyNfO9oxDUu8gABeGHQ6hvtQRYEsp5DnPy40Lugfetbr49eX2
+demuocrQIMUY8i/r1wo+ZRhVtPKYj36/OGUrYh3nNpYsVKO3VIk1CNTWwuQi/wuH
+zH5RUAh0aHGIA4zGYOfUnaczACjxN5aKOuoVlXIJ7eMuVsKGfA8og+VO4A+lhY8B
+pXgk13OuR73wSbbwROHwPQa58rjFir88Al70KycuYTv5F7WcTzBEy+ag6nAGz+fP
+DR9OKWfSepFNqom6PUAUCyXQdjn07sy2EnoE4BODKnX+yueXWaXk8DAwK7uUfk45
+NS7vJEToXCCDBqRJMncNzD9jngIp64SQFIMppwIDAQABo10wWzA6BgNVHREEMzAx
+gg13d3czLmVkdWlkLmN6hiBodHRwczovL3d3dzMuZWR1aWQuY3ovc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUIzEka3BrLts+IxnQs5Vu9e1E3ucwDQYJKoZIhvcNAQEFBQAD
+ggEBABCZ7nwiWmW6njEBHHabyX6FhaurJ73UlDO3JS7mUKjycFkA0HlabWWEeTON
+jcdtHHOzxPodqNe2dtQKa/+fauvTsnKQkBj/f6ESGQAXySuKVgZUs3aXG7C86i01
+lYMJE03P1TwHX60felfwbR4xKRoypz9pOcmqdjxMOpb0+teajFjOShL/Lm0HQs4H
+Fg9FttPBtPrn9khoZcIebOlktQATVCrazQKU0MK2smgxcqIWBoeanyhHuFbNxA/Q
+5FX1LepWs6GsCmK1qxhXj1JRBisqPEaGuauhp1CgtJJdwj5DJ3Fcw29mujFvdnln
+QioqbJmv4wcuTrPvTGy8h1+Q4iI=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www3.eduid.cz/Shibboleth.sso/SAML2/ECP" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/POST" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www3.eduid.cz/Shibboleth.sso/SAML/Artifact" index="10"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Tomášek</md:SurName>
+    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan</md:GivenName>
+    <md:SurName>Oppolzer</md:SurName>
+    <md:EmailAddress>jan.oppolzer@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
new file mode 100644
index 00000000..1639bd4d
--- /dev/null
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
+dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
+MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
+MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
+cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
+5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
+fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
+D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
+brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
+/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
+h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
+3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
+FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
+hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
+BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
+Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
+fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
+2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
+DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
+v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
+pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>