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

author: Leif Johansson <leifj@sunet.se> 2011-12-02 23:00:11 +0100
committer: Leif Johansson <leifj@sunet.se> 2011-12-02 23:00:11 +0100
commit: efc81c59fde9c1706f43c6a8166226145c158b2d (patch)
tree: 120e93940cbee10baf7593cf95b11c7d870591b2 /swamid-interfederations-2.0
parent: 2aa3447dc0f5bfacb3d8c77ce26134d373757b0b (diff)
191 files changed, 22643 insertions, 272 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index fd489d01..0d54f002 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,13 +1,33 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test" validUntil="2011-12-06T21:14:02Z" cacheDuration="PT345600S">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="gidp.geant.net" validUntil="2011-12-06T16:03:00.000Z">
+  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">gidp.geant.net</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <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>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <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>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.geant.net/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://gidp.geant.net/simplesaml/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+   <Organization>
+      <OrganizationName xml:lang="en">GEANT Identity Provider</OrganizationName>
+      <OrganizationDisplayName xml:lang="en">GEANT Identity Provider</OrganizationDisplayName>
+      <OrganizationURL xml:lang="en">http://dante.net</OrganizationURL>
+   </Organization>
+																									    <ContactPerson contactType="technical">
+																											        <EmailAddress>edugain-ot@geant.net</EmailAddress>
+																												  </ContactPerson>
+																											  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml b/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
new file mode 100644
index 00000000..f4e87e54
--- /dev/null
+++ b/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ID-Prov.fh-ludwigshafen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-ludwigshafen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
+bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
+MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
+bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
+ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
+GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
+EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
+lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
+h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
+/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
+mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
+MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
+BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
+mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
+B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
+bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
+9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
+30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.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://id-prov.fh-ludwigshafen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id-prov.fh-ludwigshafen.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-ludwigshafen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
+bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
+MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
+bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
+ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
+GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
+EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
+lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
+h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
+/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
+mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
+MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
+BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
+mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
+B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
+bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
+9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
+30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.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">Fachhochschule Ludwigshafen am Rhein</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">FH Ludwigshafen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fh-ludwigshafen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Andreas</GivenName>
+      <SurName>Müller</SurName>
+      <EmailAddress>Andreas.Mueller@fh-ludwigshafen.de</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..a54f9b96
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<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="2011-10-13T12:54:06Z">
+				<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.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">switch.ch</shibmd:Scope>
+				
+				<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+					<mdui:DisplayName xml:lang="en">SWITCH</mdui:DisplayName>
+					<mdui:Description xml:lang="en">The SWITCH Identity Provider is used by SWITCH staff members.</mdui:Description>
+					<mdui:Keywords xml:lang="en">others</mdui:Keywords>
+				</mdui:UIInfo>
+			</Extensions>
+			<KeyDescriptor use="signing">
+				<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+					<ds:X509Data>
+						<ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJALH1hdjM5J6tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTEwODE4MDkxMDE1WhcNMTQwODE4
+MDkxMDE1WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyN34o37PuK6vfsVhd9+6cvFke6a2IE9l
+K0rInDIajMQn+E99p980vMT62204zrvH8JF8QA1xYpAn9XWVcAI5ptyaDNUakyn0
+yccNihu7n1exFC6yBOvAs/oDgMHjhE4fmZb8X8xM/ci91M9FqV6/ZSJsU1TpIPPI
++i1dBAhHu8EeVkUpClldb8wxTCDJ0iQ0Y9Ff6dANvfhnowTs5DhaYAGg3hxgGpCT
+L8LBTRK9f4yBF+cLTOWQj2H2LbDwee7dZhzo4FAIsOa3Y4gF/qB/bNM5bsdzFNI+
+iLlRyzW1DyreFT6HY86wi2G+nlkMEsJEkLt2S4ihvu2OhtAVPxxbAwIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC/u+yrAyZKH
+fbhFyZtApyeW6i+cMA0GCSqGSIb3DQEBBQUAA4IBAQBx/6KLyp29jxhLYfU1vHP5
+QMstAwAikyfvRX4pIlFIAYjTJAgAZ+7Kni7Keng1N1DqHvL7KjMp3EbsiPqVYWqW
+BWaCjw76kujxMaXDni0vPhAvLfuJH4/UuZVhhIsKO7+edd3hHl1tvXuT3CaWo+c6
+hN2nTdP5TaVZ+CPQp5VVjrFUcNWefgioL3y+RPdbtBAoGtOuiGKtiOMoBOFFZIMQ
+VUEhwCVbRIE1G3zSs5X50edvePGZMpbANxEwxXHnQdSUFVCxPjV8I+bo93fV11Dp
+c1FacVORKSxWRMJL3kGzA8EvfzN+4mYs5JxslTdsyI0k6QssjCWq/Nk+B1RtHC/Y
+						</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: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"/>
+			<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.switch.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">switch.ch</shibmd:Scope>
+			</Extensions>
+			<KeyDescriptor use="signing">
+				<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+					<ds:X509Data>
+						<ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJALH1hdjM5J6tMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2FhaS1sb2dvbi5zd2l0Y2guY2gwHhcNMTEwODE4MDkxMDE1WhcNMTQwODE4
+MDkxMDE1WjAeMRwwGgYDVQQDExNhYWktbG9nb24uc3dpdGNoLmNoMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyN34o37PuK6vfsVhd9+6cvFke6a2IE9l
+K0rInDIajMQn+E99p980vMT62204zrvH8JF8QA1xYpAn9XWVcAI5ptyaDNUakyn0
+yccNihu7n1exFC6yBOvAs/oDgMHjhE4fmZb8X8xM/ci91M9FqV6/ZSJsU1TpIPPI
++i1dBAhHu8EeVkUpClldb8wxTCDJ0iQ0Y9Ff6dANvfhnowTs5DhaYAGg3hxgGpCT
+L8LBTRK9f4yBF+cLTOWQj2H2LbDwee7dZhzo4FAIsOa3Y4gF/qB/bNM5bsdzFNI+
+iLlRyzW1DyreFT6HY86wi2G+nlkMEsJEkLt2S4ihvu2OhtAVPxxbAwIDAQABo20w
+azBKBgNVHREEQzBBghNhYWktbG9nb24uc3dpdGNoLmNohipodHRwczovL2FhaS1s
+b2dvbi5zd2l0Y2guY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC/u+yrAyZKH
+fbhFyZtApyeW6i+cMA0GCSqGSIb3DQEBBQUAA4IBAQBx/6KLyp29jxhLYfU1vHP5
+QMstAwAikyfvRX4pIlFIAYjTJAgAZ+7Kni7Keng1N1DqHvL7KjMp3EbsiPqVYWqW
+BWaCjw76kujxMaXDni0vPhAvLfuJH4/UuZVhhIsKO7+edd3hHl1tvXuT3CaWo+c6
+hN2nTdP5TaVZ+CPQp5VVjrFUcNWefgioL3y+RPdbtBAoGtOuiGKtiOMoBOFFZIMQ
+VUEhwCVbRIE1G3zSs5X50edvePGZMpbANxEwxXHnQdSUFVCxPjV8I+bo93fV11Dp
+c1FacVORKSxWRMJL3kGzA8EvfzN+4mYs5JxslTdsyI0k6QssjCWq/Nk+B1RtHC/Y
+						</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>
+MIIFXzCCBEegAwIBAgICHv8wDQYJKoZIhvcNAQEFBQAwazELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAdBgNVBAsTFnd3dy5xdW92YWRp
+c2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBMB4X
+DTEwMDEyNTE0MDM1MloXDTEyMDEyNTE0MDM1MlowgcUxEzARBgsrBgEEAYI3PAIB
+AxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRVjEuMCwgQ2xh
+dXNlIDUoYikxGzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMC
+Q0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoT
+BlNXSVRDSDEcMBoGA1UEAxMTYWFpLWxvZ29uLnN3aXRjaC5jaDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMAD8TdktOo3EllyyI8jqAi5AIQ+sPhRcU/Y
+KYPbXFrde+hsiX1bmUfB5/pgxo2xY5YVun/GzUswmyTkw9svfy1mSHQDobQoSjUo
+V7+Tt7uXuYadgD+X4qmhMqO6Gx5YZb2XYeYQpmiZu4K6zmzneoxYLyHsbWGeXmL5
+t3bOIFgnDXZ3vPwu9aRVlVCLpQMuUepShJ42GozOhe+zLyV+TQ+Js0C6SiWUE29s
+3vvKpwa9ENZDvcNBl2pzTb+vrpjwtOuVr2hYWbVRUFXUfg+DJT2Vi8wS2ip9EQrh
+emIdZiee95j30+NPs2A0lAOFMI8mLf/me7clzVzyPlubciC0ZLcCAwEAAaOCAbAw
+ggGsMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVv
+dmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1c3QucXVvdmFk
+aXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgA
+AmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNv
+bS9yZXBvc2l0b3J5MDgGA1UdEQQxMC+CE2FhaS1sb2dvbi5zd2l0Y2guY2iCGHg1
+MDkuYWFpLWxvZ29uLnN3aXRjaC5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQ
+i+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwu
+Y29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQU09huArhF3dVdkVcjXlpHDreoa0gw
+DQYJKoZIhvcNAQEFBQADggEBAGbimypeimyfCEvyJcq/IIeQgU/rvShU1YtkqMbW
+cXTnD/BU/5x7wxdsCvlVV67kqFNjDe+srD6LumWJFHkG+RihDv7PLNl7Yblg7Cb/
+5cR1KWRnxIJjxxyqmuATdY9NtQm6ZblVCHmNjgTHdej6jMh/QKc7sQ1CcAtrUJNZ
+10Zurq+IBK64VQRAfg/CKlDCBTu0MkW0F8nPFyAd/aQogqa4MN8/YOHJAiAmQpg7
+T/ev53RFyFS/LlXUo+sNozz1nHsNSjSqDgHlX0Fddur+OGA8oa1RCuiFNWI5+s9k
++KVPTJ92Ler5lSjfodTMqDXC+M1ATygO9T95iVk3QkGhxh4=
+						</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>
+		</AttributeAuthorityDescriptor>
+		<Organization>
+			<OrganizationName xml:lang="en">switch.ch</OrganizationName>
+			<OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+			<OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+		</Organization>
+		<ContactPerson contactType="technical">
+			<GivenName>SWITCHaai</GivenName>
+			<SurName>Team</SurName>
+			<EmailAddress>aai@switch.ch</EmailAddress>
+			<TelephoneNumber>+41 44 268 1505</TelephoneNumber>
+		</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..ed3b81a8
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-viewer.switch.ch/interfederation-test/shibboleth">
+			<Extensions>
+				<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2011-10-07T14:06:43Z">
+					<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.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">AAI Viewer Interfederation Test</mdui:DisplayName>
+					<mdui:Description xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</mdui:Description>
+				</mdui:UIInfo>
+			</Extensions>
+			<KeyDescriptor>
+				<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+					<ds:X509Data>
+						<ds:X509Certificate>
+MIIFRzCCBC+gAwIBAgICMcUwDQYJKoZIhvcNAQEFBQAwazELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAdBgNVBAsTFnd3dy5xdW92YWRp
+c2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBMB4X
+DTEwMTIwNjA5MTIyNloXDTEyMTIwNTA5MTIyNlowgcYxEzARBgsrBgEEAYI3PAIB
+AxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEaMBgGA1UEDxMRVjEuMCwgQ2xh
+dXNlIDUoYikxGzAZBgNVBAUTEkNILTAzNS43LjAwMS4yNzgtOTELMAkGA1UEBhMC
+Q0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJpY2gxDzANBgNVBAoT
+BlNXSVRDSDEdMBsGA1UEAxMUYWFpLXZpZXdlci5zd2l0Y2guY2gwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPqA4rar73XfGfXe83c9R5E95DOR8haMTj
+QRJYRMQvBkPlp0f2uemyuZKKpS67Ej3j8unWUGFrpn/8wN43BA7F8lNabKL0sniL
+EJ8oyA1rumhHSWyeO4XRDX7UNK7ndfP0I9BZSuOyZSNYB+uRHd+TjqOKO3lyJasU
+FQ/lD+LrGyB3WErkkiIv9gdBLSqCIwM9GSwGpK/RR5QTJup447A4bZUYhcKfEpdx
+MfRCq2si3CRyyIHw3gFPvyA++aQhMke86gd8ykk9CknatGraY3vp9ZaOpt6r4qQT
+SbytBJGwviitNucmfByPnZQUeCyQHYWMiXZnl1CHVljzmR7oAFpZAgMBAAGjggGX
+MIIBkzB0BggrBgEFBQcBAQRoMGYwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1
+b3ZhZGlzZ2xvYmFsLmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3Zh
+ZGlzZ2xvYmFsLmNvbS9xdnNzbGljYS5jcnQwUQYDVR0gBEowSDBGBgwrBgEEAb5Y
+AAJkAQIwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5j
+b20vcmVwb3NpdG9yeTAfBgNVHREEGDAWghRhYWktdmlld2VyLnN3aXRjaC5jaDAL
+BgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud
+IwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
+dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4E
+FgQUhMvsrzpNCmteAPWKpoOH9qNslqowDQYJKoZIhvcNAQEFBQADggEBAEqBKPS7
+ntxhX+24dS03DjytHR/Z8fKFmofRD6pzAM1ln/EXXm3xfIPwrKU/eW/46Q/8qVdR
+Yxa9UguXNoMY4VWPycdsgo16LDDBs5Yrl/aoJGmnUr3ECuXuNiE0NsxkTWQVdIyv
+VuBSFkisYlM/cGnhkYqMolekACJdRroKeWvxdTWOKXuh2V8YqeSBxjKByzJvAXbu
+JTEstSpuAT8OldXKMIPdSB85VNP5yQSatX98A0Msv2lxbHqQHOCE6S0rqwi8bOnb
+/pPzH4mnuov5iz3ZLfR5jAvgdHeiTmWNjEKHC3R7uccXko0QtYW1fmwhLZEcfNyl
+85gvK0sAt3JJ+nA=
+						</ds:X509Certificate>
+					</ds:X509Data>
+				</ds:KeyInfo>
+			</KeyDescriptor>
+			<KeyDescriptor>
+				<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+					<ds:X509Data>
+						<ds:X509Certificate>
+MIIDQjCCAiqgAwIBAgIJAMeYgxLEdGQwMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFGFhaS12aWV3ZXIuc3dpdGNoLmNoMB4XDTExMTAwNzE0MDQxMVoXDTE0MTAw
+NjE0MDQxMVowHzEdMBsGA1UEAxMUYWFpLXZpZXdlci5zd2l0Y2guY2gwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFncQxoayrlXN3BeB/fPh9gNQFPfyi
+LBcX4nFZVo6ezlKu2CuuKrmGEfTGv3FGrGayjNq+jTETpozlAnGf1Fqhhp7S4FWn
+EuDKM8HS9pJJDMVKRvT+0HVXNiFzWa1fd8g/GTvW62QrBsjVwoSw6jOQAGtvrCn1
+g9qx0f7cZBY8xfIQs5tuLlrwBSHmn+VgLDYwlHS+8VxM7HOrFdobVKPZ2JnFLnmO
+Br2bvU/IE2cu+bRxIZWx5k8ixtkVNZLeMEUqe5fAxYvEBbiar4IhND3Q9q4PjOSb
+89dS8Q9alL5VDPO2+3wyKeYg2IujRq6bHHEOch6qi67KTnaYo2PvixPZAgMBAAGj
+gYAwfjBdBgNVHREEVjBUghRhYWktdmlld2VyLnN3aXRjaC5jaIY8aHR0cHM6Ly9h
+YWktdmlld2VyLnN3aXRjaC5jaC9pbnRlcmZlZGVyYXRpb24tdGVzdC9zaGliYm9s
+ZXRoMB0GA1UdDgQWBBQTU1gl2JGWfXV9dyXZ3ayPcmhMITANBgkqhkiG9w0BAQUF
+AAOCAQEAFtizBcK1F/gaTSIm43Hf7DCcrZ4/DDnnDhsLciw3P+5OBEI9+Qwpbbnk
+fT9uJwfDDicuGedI09oHuQOhmEpnaxow9dY90gF7fXGtyQwQh9j9dpemz7sl5i+L
+PqGJIRyQsFJePnP28qtRwRs2iR1KXOAuT+ADQPTtPI2CtoOWyydfkKuTc1k76lvL
+RVAfenx2TKAKYHAK8ZZ5qKMh6+c+SSf2pyoG5gyYgeYrjmOLDNOIXMP8h+/3syBQ
+v8+O+F0jEwWNomkVvgOF5rIfq2ldo+82gg2OJcrQTM2h9FGzGx34cf5690tttglF
+qNpt4r7fuFvtKS8xFHlf06eec/Xnxw==
+						</ds:X509Certificate>
+					</ds:X509Data>
+				</ds:KeyInfo>
+			</KeyDescriptor>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SLO/Redirect"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SLO/POST"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SLO/Artifact"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SLO/SOAP"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/NIM/Redirect"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/NIM/POST"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/NIM/Artifact"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/NIM/SOAP"/>
+			<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/interfederation-test/Shibboleth.sso/SAML2/POST" index="1"/>
+			<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+			<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SAML2/Artifact" index="3"/>
+			<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SAML2/ECP" index="4"/>
+			<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SAML/POST" index="5"/>
+			<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai-viewer.switch.ch/interfederation-test/Shibboleth.sso/SAML/Artifact" index="6"/>
+			<AttributeConsumingService index="1">
+					<ServiceName xml:lang="en">AAI Viewer Interfederation Test</ServiceName>
+					<ServiceDescription xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</ServiceDescription>
+				<RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+					
+					
+				<RequestedAttribute FriendlyName="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="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">switch.ch</OrganizationName>
+			<OrganizationDisplayName xml:lang="en">SWITCH</OrganizationDisplayName>
+			<OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+		</Organization>
+		<ContactPerson contactType="technical">
+			<GivenName>AAI</GivenName>
+			<SurName>Team</SurName>
+			<EmailAddress>aai@switch.ch</EmailAddress>
+			<TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+		</ContactPerson>
+		</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.csc.fi.xml b/swamid-interfederations-2.0/aai.csc.fi.xml
new file mode 100644
index 00000000..1d8f5919
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.csc.fi.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.csc.fi">
+    <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://aai.csc.fi/Shibboleth.sso/DS" 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://aai.csc.fi/Shibboleth.sso/DS2" index="2"/>
+        <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://aai.csc.fi/Shibboleth.sso/DFN" index="3"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>aai.csc.fi</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
+BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
+IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
+9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
+bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
+1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
+BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
+ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
+t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
+dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
+Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
+rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>aai.csc.fi</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
+BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
+IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
+9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
+bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
+1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
+BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
+ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
+t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
+dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
+Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
+rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SLO/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/NIM/POST"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.csc.fi/Shibboleth.sso/SAML/POST" index="5"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">CSC - IT Center for Science Ltd.</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">CSC</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://aai.csc.fi/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Pekka</GivenName>
+      <SurName>Järveläinen</SurName>
+      <EmailAddress>pj@csc.fi</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml b/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
new file mode 100644
index 00000000..e47a1f49
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.ruhr-uni-bochum.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ruhr-uni-bochum.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
+bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
+dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
+QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
+MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
+bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
+b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
+9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
+nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
+hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
+Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
+UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
+MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
+IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
+MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
+W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
+IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
+/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
+a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
+3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.ruhr-uni-bochum.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.ruhr-uni-bochum.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">ruhr-uni-bochum.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
+bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
+dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
+QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
+MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
+bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
+b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
+9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
+nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
+hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
+Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
+UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
+MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
+IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
+MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
+W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
+IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
+/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
+a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
+3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.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">Ruhr-Universität Bochum</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Ruhr-Universität Bochum</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ruhr-uni-bochum.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Andreas</GivenName>
+      <SurName>Jobs</SurName>
+      <EmailAddress>Andreas.Jobs@ruhr-uni-bochum.de</EmailAddress>
+    </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..73f7e065
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-leipzig.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <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>
+      </Extensions>
+      <KeyDescriptor>
+        <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">Universität Leipzig</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Leipzig</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.uni-leipzig.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Uwe</GivenName>
+      <SurName>Toenjes</SurName>
+      <EmailAddress>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..9dfa0aba
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.sztaki.hu.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<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>
+            <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>
+            </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>aai@sztaki.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <SurName>AAI Administrator Team</SurName>
+            <EmailAddress>aai@sztaki.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <SurName>AAI Administrator Team</SurName>
+            <EmailAddress>aai@sztaki.hu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atlases.muni.cz.xml b/swamid-interfederations-2.0/atlases.muni.cz.xml
index be0a17f3..a962db94 100644
--- a/swamid-interfederations-2.0/atlases.muni.cz.xml
+++ b/swamid-interfederations-2.0/atlases.muni.cz.xml
@@ -1,28 +1,103 @@
 <?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="https://atlases.muni.cz/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Atlas of dermatology</md:ServiceName>
-      <md:ServiceName xml:lang="da">Dermatologi-atlas</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: 1) Dermapathology, 2) Fetal and Neonaltal Pathology,      3) Pathology for pregraduate students of medicine. The atlases may serve as sources of teaching material for pregraduate as well as postgraduate students of pathology.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: 1) Dermatologi, 2) Fetal og neonatal patologi, 3) Patologi for      medicinstudernde. Atlasserne kan bruges som undervisningsmateriale for patologistuderende.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atlases.muni.cz/shibboleth">
+    <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://atlases.muni.cz/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>atlases.muni.cz</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=atlases.muni.cz,O=Masaryk University,C=CZ</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEaTCCA1GgAwIBAgIRAJWodRv0wQ1r0LBtit4bdAYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMTcwMDAwMDBaFw0xMjEyMTYyMzU5NTlaMEQxCzAJBgNV
+BAYTAkNaMRswGQYDVQQKExJNYXNhcnlrIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2F0
+bGFzZXMubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv0
+wLkG+KB7so18gsPG13xP6JsN+wXmV2PIgPjVdiIU3ab1d44o3zvTQbfML1jLanTi
+fpgTp4GBc7Sk+Ut5r8fmO4b2oWWPmVvRVTQTAefxOJ8EcaLkP2KIKgoA4PrxBU0R
+ummyB9ory7iG3zyUwXv6UE8B43V9xT9r11JTMVu747jWspq6tsfYsmjYDWGnJPjU
+ULPZoh3t26PlM5IK/AIMr+zs5HQJu/XFE2fOjZVBRkWmmzmWVSndZx9QKqOcTypd
+1M+5I6btXrtMlRX3e/YyQ0WiHK/6Y80N8bgujoyt7EM+Gr4vAvTO0OVYNto8aW1m
+JxwP5bv80KLhTKSF4+ECAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSAvdbx2HeGy16j42B6grP/zb/G9TAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9hdGxhc2VzLm11bmkuY3owDQYJKoZI
+hvcNAQEFBQADggEBAA6at/39C8yYR/XlQ2BLya6my2j9xkGylg+8T7rT1ZL2Ckda
+l6YaZjckWUh/vdSa6M02XVNq9lljb+i97F2CbSUV1HZNy+f2NwUXiUieZQtdpFIv
+rshymOmUFcqcuyk1e68krGW2L1pthnFD/jHC+6RKvJakn5ggP/3hLYUwaeOYo0mS
+nel/jb1K+g2X0QkeKTx6Cs/Jpl1jRpzkC7C3gQHmbHufFudaLqP8JjkMaQBivnlC
+VoXIJzftiwHK2SXx7rH6CNrbfxGeL1C0Rg2RA3jDNRlFI2Y+lIMxiHKNjRIa/JGX
+Qzh9bTGuFgSX09pFNRoQ77C3Fq3WH3ychuHUyeo=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>atlases.muni.cz</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=atlases.muni.cz,O=Masaryk University,C=CZ</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEaTCCA1GgAwIBAgIRAJWodRv0wQ1r0LBtit4bdAYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMTcwMDAwMDBaFw0xMjEyMTYyMzU5NTlaMEQxCzAJBgNV
+BAYTAkNaMRswGQYDVQQKExJNYXNhcnlrIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2F0
+bGFzZXMubXVuaS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv0
+wLkG+KB7so18gsPG13xP6JsN+wXmV2PIgPjVdiIU3ab1d44o3zvTQbfML1jLanTi
+fpgTp4GBc7Sk+Ut5r8fmO4b2oWWPmVvRVTQTAefxOJ8EcaLkP2KIKgoA4PrxBU0R
+ummyB9ory7iG3zyUwXv6UE8B43V9xT9r11JTMVu747jWspq6tsfYsmjYDWGnJPjU
+ULPZoh3t26PlM5IK/AIMr+zs5HQJu/XFE2fOjZVBRkWmmzmWVSndZx9QKqOcTypd
+1M+5I6btXrtMlRX3e/YyQ0WiHK/6Y80N8bgujoyt7EM+Gr4vAvTO0OVYNto8aW1m
+JxwP5bv80KLhTKSF4+ECAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896r
+o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSAvdbx2HeGy16j42B6grP/zb/G9TAOBgNV
+HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
+KwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9hdGxhc2VzLm11bmkuY3owDQYJKoZI
+hvcNAQEFBQADggEBAA6at/39C8yYR/XlQ2BLya6my2j9xkGylg+8T7rT1ZL2Ckda
+l6YaZjckWUh/vdSa6M02XVNq9lljb+i97F2CbSUV1HZNy+f2NwUXiUieZQtdpFIv
+rshymOmUFcqcuyk1e68krGW2L1pthnFD/jHC+6RKvJakn5ggP/3hLYUwaeOYo0mS
+nel/jb1K+g2X0QkeKTx6Cs/Jpl1jRpzkC7C3gQHmbHufFudaLqP8JjkMaQBivnlC
+VoXIJzftiwHK2SXx7rH6CNrbfxGeL1C0Rg2RA3jDNRlFI2Y+lIMxiHKNjRIa/JGX
+Qzh9bTGuFgSX09pFNRoQ77C3Fq3WH3ychuHUyeo=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atlases.muni.cz/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://atlases.muni.cz/Shibboleth.sso/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atlases.muni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://atlases.muni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Masaryk University - Institut of Computer Science</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Atlas of Pathology</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://muni.cz/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Prochazka</GivenName>
+      <SurName>Michal</SurName>
+      <EmailAddress>michalp@ics.muni.cz</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Prochazka</GivenName>
+      <SurName>Michal</SurName>
+      <EmailAddress>michalp@ics.muni.cz</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
new file mode 100644
index 00000000..e6ad55d6
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.cs.serialssolutions.com/auth/Metadata/Shib">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.serialssolutions.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
+YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
+BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
+NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
+BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
+ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
+bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
+7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
+sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
+HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
+sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
+IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
+GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
+J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
+7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
+RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
+nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
+32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tim</GivenName>
+      <SurName>Fujita-Yuhas</SurName>
+      <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.galegroup.com.xml b/swamid-interfederations-2.0/auth.galegroup.com.xml
new file mode 100644
index 00000000..20bd0429
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.galegroup.com.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.galegroup.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
+A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
+BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
+bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
+bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
+hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
+7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
+9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
+qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
+HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
+YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
+dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
+A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
+AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
+L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
+BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
+wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
+rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
+sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
+BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
+s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
+A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
+BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
+bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
+bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
+hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
+7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
+9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
+qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
+HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
+YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
+dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
+A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
+AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
+L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
+BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
+wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
+rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
+sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
+BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
+s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galedemo.com/Shibboleth.sso/SAML/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML/POST" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Cengage Learning Inc</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Gale Databases from Cengage Learning</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.cengage.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Jayashree</GivenName>
+      <SurName>Ravi</SurName>
+      <EmailAddress>jayashree.ravi@cengage.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gary</GivenName>
+      <SurName>Pollack</SurName>
+      <EmailAddress>gary.pollack@cengage.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>John</GivenName>
+      <SurName>Marx</SurName>
+      <EmailAddress>john.marx@cengage.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
new file mode 100644
index 00000000..3565e9e1
--- /dev/null
+++ b/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.search.serialssolutions.com/auth/Metadata/Shib">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.serialssolutions.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
+YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
+BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
+NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
+BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
+ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
+bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
+7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
+sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
+HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
+sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
+IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
+GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
+J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
+7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
+RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
+nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
+32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions 360 Link/Core</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tim</GivenName>
+      <SurName>Fujita-Yuhas</SurName>
+      <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beige.admin.grnet.gr.xml b/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
new file mode 100644
index 00000000..1731bdf6
--- /dev/null
+++ b/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beige.admin.grnet.gr/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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(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>
+                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
+                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
+                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
+                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
+                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
+                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
+                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
+                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
+                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
+                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
+                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
+                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
+                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
+                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
+                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
+                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
+                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
+                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
+                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
+                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
+                            o/IZYWrn/Q==
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+            </KeyDescriptor>
+            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.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>
+            <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="true">(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>
+                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
+                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
+                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
+                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
+                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
+                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
+                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
+                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
+                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
+                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
+                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
+                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
+                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
+                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
+                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
+                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
+                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
+                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
+                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
+                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
+                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
+                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
+                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
+                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
+                            o/IZYWrn/Q==
+                        </ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+            </KeyDescriptor>
+            <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+            <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.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>
+        </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>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <Company>Greek Research and Technology Network</Company>
+            <EmailAddress>helpdesk@grnet.gr</EmailAddress>
+            <TelephoneNumber>800-11-47638</TelephoneNumber>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/belser.gbv.de.xml b/swamid-interfederations-2.0/belser.gbv.de.xml
new file mode 100644
index 00000000..b978c738
--- /dev/null
+++ b/swamid-interfederations-2.0/belser.gbv.de.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://belser.gbv.de/sp">
+    <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://www.gbv.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>belser.gbv.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
+WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
+W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
+2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
+6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
+wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
+3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
+eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
+vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
+gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
+Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
+w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
+EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
+cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
+MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
+KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
+ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
+VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
+YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
+yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
+DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>belser.gbv.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
+WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
+W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
+2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
+6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
+wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
+3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
+eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
+vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
+gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
+Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
+w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
+EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
+cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
+MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
+KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
+ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
+VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
+YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
+yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
+DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gbv.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gbv.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gbv.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://belser.gbv.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Franck</GivenName>
+      <SurName>Borel</SurName>
+      <EmailAddress>borel@gbv.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml b/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
new file mode 100644
index 00000000..296d9d5e
--- /dev/null
+++ b/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blblogin.blb-karlsruhe.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">blblogin.blb-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
+EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
+hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
+MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
+ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
+ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
+dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
+d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
+jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
+IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
+Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
+1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
+Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
+BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
+VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
+LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
+MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
+dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
+4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
+kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
+firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
+Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
+OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
+Q1O4HKVwCF4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
+EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
+hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
+MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
+ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
+ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
+dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
+d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
+jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
+IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
+Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
+1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
+Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
+BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
+VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
+LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
+MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
+dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
+4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
+kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
+firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
+Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
+OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
+Q1O4HKVwCF4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.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://blblogin.blb-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blblogin.blb-karlsruhe.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">blblogin.blb-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
+EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
+hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
+MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
+ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
+ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
+dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
+d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
+jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
+IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
+Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
+1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
+Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
+BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
+VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
+LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
+MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
+dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
+4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
+kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
+firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
+Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
+OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
+Q1O4HKVwCF4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
+EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
+hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
+MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
+ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
+ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
+dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
+d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
+jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
+IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
+Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
+1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
+Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
+BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
+VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
+LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
+MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
+dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
+4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
+kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
+firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
+Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
+OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
+Q1O4HKVwCF4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.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">Badische Landesbibliothek Karlsruhe</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Badische Landesbibliothek</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.blb-karlsruhe.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Uli</GivenName>
+      <SurName>Fietz</SurName>
+      <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Uli</GivenName>
+      <SurName>Fietz</SurName>
+      <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bscw.uamr.de.xml b/swamid-interfederations-2.0/bscw.uamr.de.xml
new file mode 100644
index 00000000..f44f425e
--- /dev/null
+++ b/swamid-interfederations-2.0/bscw.uamr.de.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bscw.uamr.de/shibboleth">
+    <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://bscw.uamr.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>bscw.uamr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
+MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
+VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
+ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
+bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
+A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
+ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
+tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
+UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
+HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
+t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
+L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
+EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
+QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
+AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
+KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
+c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
+5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
+yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
+Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
+MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
+fiJZCVlIJyI/zGzKQRTD9w==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>bscw.uamr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
+MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
+VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
+ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
+bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
+A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
+ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
+tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
+UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
+HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
+t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
+L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
+EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
+QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
+AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
+KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
+c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
+5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
+yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
+Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
+MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
+fiJZCVlIJyI/zGzKQRTD9w==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Malte</GivenName>
+      <SurName>Küppers</SurName>
+      <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Malte</GivenName>
+      <SurName>Küppers</SurName>
+      <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml b/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
new file mode 100644
index 00000000..5c5d131d
--- /dev/null
+++ b/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bwescitts.uni-tuebingen.de/shibboleth-sp">
+    <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://bwescitts.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
+U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
+SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
+jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
+5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
+ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
+lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
+1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
+4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
+MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
+bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
+YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
+BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
+dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
+TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
+X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
+3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
+sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
+VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
+U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
+SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
+jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
+5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
+ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
+lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
+1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
+4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
+MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
+bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
+bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
+YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
+BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
+dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
+TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
+X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
+3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
+sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
+VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">bwescitts</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">BW-eSci(T)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.bwescit.uni-tuebingen.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ulrich</GivenName>
+      <SurName>Hahn</SurName>
+      <EmailAddress>ulrich.hahn@uni-tuebingen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml b/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
new file mode 100644
index 00000000..fd7dc992
--- /dev/null
+++ b/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cast.itunes.uni-muenchen.de/shibboleth">
+    <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://cast.itunes.uni-muenchen.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
+BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
+BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
+MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
+eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
+dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
+Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
+5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
+8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
+OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
+8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
+AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
+f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
+YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
+PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
+ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
+vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
+qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
+DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
+Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
+BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
+BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
+MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
+CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
+eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
+dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
+Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
+5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
+8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
+OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
+8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
+AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
+f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
+YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
+PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
+ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
+vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
+qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
+DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
+Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.lmu.de/Shibboleth.sso/SAML2/POST" index="8"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">LMUcast für iTunesU</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">LMUcast für iTunesU</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://cast.itunes.uni-muenchen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Armin</GivenName>
+      <SurName>Rubner</SurName>
+      <EmailAddress>a.rubner@lmu.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Fabio</GivenName>
+      <SurName>Vena</SurName>
+      <EmailAddress>fabio.vena@vilea.ch</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..98e59055
--- /dev/null
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
+    <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"/>
+      </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"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS) - CLARIN Dienste</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Oliver</GivenName>
+      <SurName>Schonefeld</SurName>
+      <EmailAddress>schonefeld@ids-mannheim.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Andreas</GivenName>
+      <SurName>Witt</SurName>
+      <EmailAddress>witt@ids-mannheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cnb.rediris.es.xml b/swamid-interfederations-2.0/cnb.rediris.es.xml
new file mode 100644
index 00000000..8fb2b382
--- /dev/null
+++ b/swamid-interfederations-2.0/cnb.rediris.es.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://cnb.rediris.es/simplesaml/saml2/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="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>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBAcTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTWHgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2fcIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</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>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBAcTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTWHgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2fcIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cnb.rediris.es/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="http://cnb.rediris.es/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="es">Red Académica y de Investigación Española</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">RedIRIS - Spanish National Research and Education Network</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Ajay</md:GivenName>
+    <md:SurName>Daryanani</md:SurName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/content.karger.com.xml b/swamid-interfederations-2.0/content.karger.com.xml
new file mode 100644
index 00000000..f03e4cb5
--- /dev/null
+++ b/swamid-interfederations-2.0/content.karger.com.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://content.karger.com/shibboleth">
+    <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://content.karger.com/Shibboleth.sso/dfn-aai" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>content.karger.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHs8WPjBgP4MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0wOTAxMDcxNDQ5NDBaFw0xMjAxMDcx
+NDQ5NDBaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMWn2kceVFr5zQ8O8ALoGDx+E3AxiMGhLkGr
+hNpUYRl2kL6niomXvz+gYFVjhH2nrQpRyL6UKpzuDrhazff5tjgCzNsSuZjx4qJ2
+l3ktvgqPUhIfiGX18uFqqVjpMdbVZKwwBsQiPHa/Ki63dLsGiyL594M09BkGtCmc
+7Uxz6t7A+RJd3c6ZzSGHybPsA+8Lbq9NvrNFmOe+JdkqL20P7cFhQpahrwyHRo+q
++cR5Kc5M1NR/MvjzgVgmf93lpa4Kt0QzA5iiFf3+67JVS8EQp+p2vBH6vNc8qJB/
+UJBC8X2T5W22xxqVmI8428SSq9+S3tKWY9uzQ7nEwrVDaOjVQVUCAwEAAaNnMGUw
+RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
+a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBRyVy/Dbxl1Eg2oU9A5v5+k
+a9nF9DANBgkqhkiG9w0BAQUFAAOCAQEApwrcqtBOYzkSxmgp9CuTX3a/bUz2A3OO
+L8oMWE1+uUv7nEiFvWXSWOWkPP5OZYr67Tujrmi6GQDFC9bV9NGEhDQw+Hxm59VK
+NzMDZSN7dSw7VqztOIOGmehjrFNdBpMRyu/M/Y+jnHLTe+Yu51UpsqLUv+CPMtAy
+6CXgzED3emw6Sbrl4Bx61HOtGatpyYRCWILFZH34dADH2qrOlFw7RKwyRNK1lREV
+Lk1vweZWh4wYC6Ajop3P4iwiG+2iDOI/GewBOdCyILjXSAogU+gV3JiaHdj7UcJk
+jlECizd1S73FU7pRVcKGHcrf7aSCNegDsVm5EZPWVSZfK6fJN6rVYQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>content.karger.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJALHs8WPjBgP4MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0wOTAxMDcxNDQ5NDBaFw0xMjAxMDcx
+NDQ5NDBaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMWn2kceVFr5zQ8O8ALoGDx+E3AxiMGhLkGr
+hNpUYRl2kL6niomXvz+gYFVjhH2nrQpRyL6UKpzuDrhazff5tjgCzNsSuZjx4qJ2
+l3ktvgqPUhIfiGX18uFqqVjpMdbVZKwwBsQiPHa/Ki63dLsGiyL594M09BkGtCmc
+7Uxz6t7A+RJd3c6ZzSGHybPsA+8Lbq9NvrNFmOe+JdkqL20P7cFhQpahrwyHRo+q
++cR5Kc5M1NR/MvjzgVgmf93lpa4Kt0QzA5iiFf3+67JVS8EQp+p2vBH6vNc8qJB/
+UJBC8X2T5W22xxqVmI8428SSq9+S3tKWY9uzQ7nEwrVDaOjVQVUCAwEAAaNnMGUw
+RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
+a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBRyVy/Dbxl1Eg2oU9A5v5+k
+a9nF9DANBgkqhkiG9w0BAQUFAAOCAQEApwrcqtBOYzkSxmgp9CuTX3a/bUz2A3OO
+L8oMWE1+uUv7nEiFvWXSWOWkPP5OZYr67Tujrmi6GQDFC9bV9NGEhDQw+Hxm59VK
+NzMDZSN7dSw7VqztOIOGmehjrFNdBpMRyu/M/Y+jnHLTe+Yu51UpsqLUv+CPMtAy
+6CXgzED3emw6Sbrl4Bx61HOtGatpyYRCWILFZH34dADH2qrOlFw7RKwyRNK1lREV
+Lk1vweZWh4wYC6Ajop3P4iwiG+2iDOI/GewBOdCyILjXSAogU+gV3JiaHdj7UcJk
+jlECizd1S73FU7pRVcKGHcrf7aSCNegDsVm5EZPWVSZfK6fJN6rVYQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">S.Karger</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Karger Publishers</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://content.karger.com/PrudukteDB</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Mike</GivenName>
+      <SurName>Dürst</SurName>
+      <EmailAddress>m.duerst@karger.ch</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Mike</GivenName>
+      <SurName>Dürst</SurName>
+      <EmailAddress>m.duerst@karger.ch</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml b/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
new file mode 100644
index 00000000..78df6a65
--- /dev/null
+++ b/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crux.hrz.tu-freiberg.de/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
+ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
+LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
+MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
+MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
+ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
+MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
+Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
+N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
+XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
+1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
+q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
+FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
+ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
+dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
+zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
+LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
+HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
+7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
+2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
+ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
+LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
+MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
+MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
+ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
+MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
+Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
+N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
+XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
+1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
+q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
+FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
+ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
+dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
+zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
+LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
+HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
+7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
+2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://crux.hrz.tu-freiberg.de/shibboleth-idp/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
+ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
+LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
+MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
+MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
+ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
+MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
+Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
+N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
+XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
+1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
+q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
+FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
+ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
+dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
+zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
+LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
+HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
+7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
+2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
+ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
+LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
+MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
+MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
+ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
+MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
+Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
+N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
+XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
+1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
+q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
+FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
+ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
+Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
+Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
+dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
+zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
+LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
+HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
+7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
+2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Freiberg (Technische Universität Bergakademie)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">TU Bergakademie Freiberg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-freiberg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Martin</GivenName>
+      <SurName>Morgenstern</SurName>
+      <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Martin</GivenName>
+      <SurName>Morgenstern</SurName>
+      <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.saur.de.xml b/swamid-interfederations-2.0/db.saur.de.xml
new file mode 100644
index 00000000..83104857
--- /dev/null
+++ b/swamid-interfederations-2.0/db.saur.de.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.saur.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>db.saur.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
+MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
+06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
+O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
+jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
+bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
+o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
+AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
+GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
+aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
+dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
+CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
+cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
+/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
+QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
+Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
+x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
+yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>db.saur.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
+MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
+06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
+O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
+jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
+bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
+o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
+AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
+GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
+aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
+dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
+CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
+cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
+/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
+QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
+Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
+x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
+yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://db.saur.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://db.saur.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://db.saur.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.saur.de/Shibboleth.sso/SAML/POST" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">K. G. Saur Verlag</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">K. G. Saur Verlag, ein Imprint der Walter de Gruyter GmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.saur.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ulrike</GivenName>
+      <SurName>Engel</SurName>
+      <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Cristian</GivenName>
+      <SurName>Vat</SurName>
+      <EmailAddress>cristian.vat@level7.ro</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml b/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
new file mode 100644
index 00000000..dc1cc0ee
--- /dev/null
+++ b/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.ub.uni-stuttgart.de">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
+NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
+ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
+haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
+qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
+0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
+n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
+a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
+AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
+R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
+gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
+BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
+dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
+3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
+eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
+KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
+TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
+c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
+NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
+ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
+haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
+qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
+0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
+n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
+a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
+AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
+R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
+gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
+BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
+dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
+3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
+eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
+KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
+TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
+c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.shire" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML2/POST" index="3"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Stuttgart</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universitätsbibliothek Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ralf</GivenName>
+      <SurName>Engelmann</SurName>
+      <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ralf</GivenName>
+      <SurName>Engelmann</SurName>
+      <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml b/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
new file mode 100644
index 00000000..b82e4d97
--- /dev/null
+++ b/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
+    <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://www.dreamspark.com/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.dreamspark.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.dreamspark.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJAOAnCSnCRCHEMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEnd3dy5kcmVhbXNwYXJrLmNvbTAeFw0xMDEwMDQxMDAyMTBaFw0xMzEwMDMx
+MDAyMTBaMB0xGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJrLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKSB9dRKIpfDAdGbla2Z4lNxRHURAsUb8LvT
+ALm0+v9RP/Hq7dAHSGHmQgv15s/0fi6i8p3EEtiBcnPVKJxvff82kLvV9AjrLp2l
+Szq+nz1oD1zElm44Caw9NMHc4n0NfvRSlAH1VKZUEXo5gm+jMHcpx/wDoMqNGEOq
+XXglXNoeftFWmlhU/loHuLIfREtadWB4mzOzqCCW5Ak7ESF6hVW5mD73QgJPgLVt
+Y4K1HouT4hC9oDhG4RHx1C/pex3JqTVirhTiWCKZCuVk7u8lVTOojr9mKczhO2HX
+85x4i8o+NzeBNchzs/WUXtdvqPzw8/Y7kSGhcG0FE2Db7uAPmXkCAwEAAaN+MHww
+HQYDVR0OBBYEFFml+PG8Rd7m471DG1DTwNsiM8njME0GA1UdIwRGMESAFFml+PG8
+Rd7m471DG1DTwNsiM8njoSGkHzAdMRswGQYDVQQDExJ3d3cuZHJlYW1zcGFyay5j
+b22CCQDgJwkpwkQhxDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4
+mZ5q44Xzp0ffUgr+XBC1iD+GhXQbC+fiMR4Cd1RFu9+p2p2iKwrZVQ0m+6fegO3F
+Cd2S+14+jgg7O4EfQcf+A4IcfVIs/g3EhqRleXoZqYusZJOwAUOhIm+vSjDxv11D
+gBvhFnVqgL04VKmGopK35kSspkhXm3BJgd/dqvXTYiNeKw6yk77sdSDiZxk6nRlD
+HS/mVvdjQUf0yyJNHZp6eEBgWgxmIGBRoKhb6hi5scIylBTUewqBqUnaW+t0kF8f
+qhw5X47o07/+9CJh8DsO1KpfM2CNZbIMUEY2q1wBfhE5HlI4wVXJYQqeUsqHXr1G
+ssIJnnOiYS0/QF/t7Wkd
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/POST" index="7"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/Artifact" index="8"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Microsoft Deutschland GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Microsoft DreamSpark</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.dreamspark.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Scott</GivenName>
+      <SurName>Blackwell</SurName>
+      <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>DS Team</GivenName>
+      <SurName>Microsoft</SurName>
+      <EmailAddress>ds-team@microsoft.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml b/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
new file mode 100644
index 00000000..5c9dd549
--- /dev/null
+++ b/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elektra.bsb-muenchen.de/shibboleth">
+    <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://elektra.bsb-muenchen.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>elektra.bsb-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=elektra.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzzCCBLegAwIBAgIEDqN6FjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
+G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
+ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
+CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODEzMTE0NDA2WhcNMTQwODEy
+MTE0NDA2WjCBnzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
+BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
+azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMSAwHgYDVQQD
+ExdlbGVrdHJhLmJzYi1tdWVuY2hlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAN7Ez06ZGFW2qRt6TT1XX2pDeQ77ZID+punNbvRhg6JSvSOrQqmf
+9BVvWSh6OgWU1qUdC3M8VQ0S/15RcdgJI6G5NFQZO9RGyi+XW2z8DAgZ5mENbacG
+xfponlazmx8s4Z4H0ql4+24bei0hgAd0XReaMsMKOPDL3giaKXCtPQOCKri033V8
+magAFFnjQ62MRNI3Ani1WZ8gzfQrbdmEwt5xaYGe+cIveUmEEHhLNpE3WgpWPHZm
+40WST0FZBeW7XFKrCWqI2CBJvHbkLE6tCJweoCS6XTLhjvD0CPvBdKSfTW2T2GG0
+7puLVNAPyve/k5aNldQMWsMQm/qAAVi4Q/UCAwEAAaOCAfwwggH4MAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
+BgNVHQ4EFgQU1VAUVL1KQEJcllaGZ3cK7zmTQ3UwHwYDVR0jBBgwFoAUemeMWxoT
+RIKzIVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Jh
+eWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5j
+cmwwgcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAp1+BjRR9kfoUqN2Sw
+cSFdlI/x9YYNRL+/Felm1TF+KtBMdPtx/oWVnNhvxGXxwwlWJ/1RpHA4Prd01+IR
+W/6qISA19D58AJaim/bRe6gtfWM65XtOAzgvoLBRDj1zO0FS3yj7mdcvodhmtP2q
+55k6F4c/lC1y/bbytpSurlUsIF5QU6HeKSWwpbKCg/JK6at+75E4Uk/DFagfqDg4
+J0TTCKM98DtgZ7+9K5wYyx20HhlDKGm4V/pj5hDeiirCsp8UXO5fcQmvvwvAe4uw
+iI4aaIJAqMcdKoi0xt6antv5F/bxsqzJskIbJiyIT2qeCoT+rVZ9SmIZh3u/Zwqj
+56P0
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://elektra.bsb-muenchen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Wunderle</GivenName>
+      <SurName>Heinrich</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml b/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
new file mode 100644
index 00000000..235297ec
--- /dev/null
+++ b/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ephraim.tu-berlin.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-berlin.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
+VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
+OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
+A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
+aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
+HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
+fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
+ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
+QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
+pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
+VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
+F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
+A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
+gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
+bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
+cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
+yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
+3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
+tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
+sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
+VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
+OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
+A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
+aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
+HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
+fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
+ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
+QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
+pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
+VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
+F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
+A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
+gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
+bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
+cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
+yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
+3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
+tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
+sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-berlin.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://shibboleth.tubit.tu-berlin.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.tubit.tu-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">tu-berlin.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
+VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
+OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
+A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
+aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
+HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
+fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
+ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
+QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
+pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
+VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
+F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
+A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
+gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
+bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
+cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
+yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
+3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
+tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
+sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
+VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
+OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
+A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
+aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
+HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
+fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
+ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
+QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
+pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
+VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
+F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
+A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
+gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
+bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
+cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
+yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
+3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
+tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
+sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-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">Universität Berlin (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Technische Universität Berlin</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-berlin.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gerd</GivenName>
+      <SurName>Schering</SurName>
+      <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Gerd</GivenName>
+      <SurName>Schering</SurName>
+      <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Thomas</GivenName>
+      <SurName>Gebhardt</SurName>
+      <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Gebhardt</SurName>
+      <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>tubit-</GivenName>
+      <SurName>shibbolethsupport</SurName>
+      <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>tubit-</GivenName>
+      <SurName>shibbolethsupport</SurName>
+      <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml b/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
new file mode 100644
index 00000000..cc37e68a
--- /dev/null
+++ b/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://erf.sbb.spk-berlin.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
+VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
+VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
+CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
+MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
+BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
+QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
+MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
+6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
+wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
+ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
+ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
+RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
+p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
+ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
+aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
+bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
+0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
+AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
+f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
+vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
+7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
+i+qpO2NCiiTGlah8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
+VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
+VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
+CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
+MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
+BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
+QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
+MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
+6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
+wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
+ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
+ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
+RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
+p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
+ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
+aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
+bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
+0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
+AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
+f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
+vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
+7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
+i+qpO2NCiiTGlah8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Staatsbibliothek zu Berlin</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Staatsbibliothek zu Berlin Service Provider</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://staatsbibliothek-berlin.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Jann-Gerd</GivenName>
+      <SurName>Hans</SurName>
+      <EmailAddress>jgh@sbb.spk-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Gerrit</GivenName>
+      <SurName>Gragert</SurName>
+      <EmailAddress>gerrit.gragert@sbb.spk-berlin.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/finden.nationallizenzen.de.xml b/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
new file mode 100644
index 00000000..48c87b5c
--- /dev/null
+++ b/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://finden.nationallizenzen.de/sp/suchkiste">
+    <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://finden.nationallizenzen.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
+WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
+++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
+WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
+SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
+3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
+QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
+AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
+qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
+D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
+KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
+E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
+iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
+9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
+oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
+A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
+WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
+QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
+++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
+WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
+SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
+3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
+QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
+AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
+qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
+D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
+KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
+ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
+E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
+iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
+9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
+oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
+A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Suchkiste</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Suchkiste der Nationallizenzen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://finden.nationallizenzen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Franck</GivenName>
+      <SurName>Borel</SurName>
+      <EmailAddress>borel@gbv.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Till</GivenName>
+      <SurName>Kinstler</SurName>
+      <EmailAddress>kinstler@gbv.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gerald</GivenName>
+      <SurName>Steilen</SurName>
+      <EmailAddress>steilen@gbv.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org.xml
index d437d9c4..54b07857 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org.xml
@@ -1,15 +1,21 @@
 <?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="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>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/">
+            <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 use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="en">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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIICLzCCAZgCCQDWeshLcjcICTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wHhcNMDkwMTMwMTIyMzI4WhcNMzYwNjE2MTIyMzI4WjBcMQswCQYDVQQGEwJOTzELMAkGA1UECBMCU1QxEjAQBgNVBAcTCVRyb25kaGVpbTESMBAGA1UEChMJRmVpZGUgUm5EMRgwFgYDVQQDEw9mb29kbGUuZmVpZGUubm8wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMLZMDXYErToL/IAb8WcTYN4bGZtwnwc8RmsuFSo2Bu3q+27fQIjn5uF/OfC9D2Bs5nqy8PjHSfp4gTG2gL/+Vi8J1rLnTLgTCBl/DacPU1MhkKiw8+dqzsPm96ELoDRJH4+O0vML3rUizkpZidEN5CgWNcg72CyKE83vN7zijevAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAmw2o4gbWppGxd5Xleyyd+s2kJMVnuXlwjsLiXz8uzeqOifAG1RVTZQDCxIAw8lAse1nLKKGZYj5PyCVwAhVjaVYuATErfeJqyTft9xtbH6Qk5mV99u1GujO2Lx54uaZFOCiCahwQGPfAm+qlrCteDoE8gqo0RJWno/HQxXE6/ac=</ds:X509Certificate>
         </ds:X509Data>
@@ -22,13 +28,34 @@
       <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"/>
       <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.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.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.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..6731bda2
--- /dev/null
+++ b/swamid-interfederations-2.0/forge.switch.ch.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<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="2011-10-07T15:27:56Z">
+					<mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement.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">Public issue tracking and project development platform for SWITCH projects</mdui:Description>
+				</mdui:UIInfo>
+			</Extensions>
+			<KeyDescriptor>
+				<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+					<ds:X509Data>
+						<ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIJAIhELMaYXJtGMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2ZvcmdlLnN3aXRjaC5jaDAeFw0xMDA2MTQxNDQ4MzZaFw0xMzA2MTMxNDQ4
+MzZaMBoxGDAWBgNVBAMTD2ZvcmdlLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALv9ahuinOJIpRRXfe1WbDb3CJTeLc/3wfTf8RG0B736
+oEF67v3xV35YcNROsxP6z/sXnG8NhQaYimMtYQyqERIFVayWwUIK1MKcM6AW4eZo
+SdsogVJI5Vg2wz608QA5owG6w2TyAlqLGCEIhQzXPlb8XbHI2mF9DJJnfQqPIdTU
+xnt6Dj+ktWCuyHOv791+SJ61CbFWq4WrcmaKaslUL4xG5swXCHt0RYT7e+431kpe
+apTlmNNALL5Cso2bKzI6mo9iFJt1yAfpHf0bBUTyXEY1FHTzruQFepDnFi0V+vHH
+/WRnfNQictTTlNWCuiiQYaLXuR75deqxEWEftxmLh18CAwEAAaNhMF8wPgYDVR0R
+BDcwNYIPZm9yZ2Uuc3dpdGNoLmNohiJodHRwczovL2ZvcmdlLnN3aXRjaC5jaC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBTUlcwG0PaQjaxwY5xQvWkV0c1R4zANBgkqhkiG
+9w0BAQUFAAOCAQEAF423rJ1QSG6x4BixmXpWu7ctPaVCzAJJQsgtSNf/NDdqCrQ1
+wLsHP1lBg1sgQ4gV7OQcizqQlZNnid59VY7xLEc0rvINhbc/5j47YcGnFeqr3Hjs
++nDFW6dDqv8CvEcQg1/bXCwhmHQahJCtBZ2alXoaCSuGLJy6tg3XVunUUPhkTQlD
+244m3kUR1vcsJdmBqIXFr6+qpF7fuj+WjPQOTpnSoiSbWtNR37t+OiEeSkkPrrAG
+Zxx0VRzLBqR5oNC6j2Dbgzq7Vlcz6+aM4QYcce/MvMSDJesIpL3N9h/95Ez6HsWA
+5PtUzDTuzk7ehE3u3vEVFhpf4dEh6oNKWC+sOQ==
+						</ds:X509Certificate>
+					</ds:X509Data>
+				</ds:KeyInfo>
+			</KeyDescriptor>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forge-dev.switch.ch/Shibboleth.sso/SLO/Redirect"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forge.switch.ch/Shibboleth.sso/SLO/Redirect"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeya.switch.ch/Shibboleth.sso/SLO/Redirect"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge-dev.switch.ch/Shibboleth.sso/SLO/POST"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SLO/POST"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SLO/POST"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SLO/Artifact"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SLO/Artifact"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SLO/Artifact"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forge-dev.switch.ch/Shibboleth.sso/SLO/SOAP"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forge.switch.ch/Shibboleth.sso/SLO/SOAP"/>
+			<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeya.switch.ch/Shibboleth.sso/SLO/SOAP"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forge-dev.switch.ch/Shibboleth.sso/NIM/Redirect"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://forge.switch.ch/Shibboleth.sso/NIM/Redirect"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zeya.switch.ch/Shibboleth.sso/NIM/Redirect"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge-dev.switch.ch/Shibboleth.sso/NIM/POST"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/NIM/POST"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/NIM/POST"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/NIM/Artifact"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/NIM/Artifact"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/NIM/Artifact"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forge-dev.switch.ch/Shibboleth.sso/NIM/SOAP"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://forge.switch.ch/Shibboleth.sso/NIM/SOAP"/>
+			<ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zeya.switch.ch/Shibboleth.sso/NIM/SOAP"/>
+			<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">Public issue tracking and project development 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="en">SWITCH</OrganizationDisplayName>
+			<OrganizationURL xml:lang="en">http://www.switch.ch/</OrganizationURL>
+		</Organization>
+		<ContactPerson contactType="technical">
+			<GivenName>Lukas</GivenName>
+			<SurName>Hämmerle</SurName>
+			<EmailAddress>lukas.haemmerle@switch.ch</EmailAddress>
+			<TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+		</ContactPerson>
+		</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
new file mode 100644
index 00000000..20a6bc80
--- /dev/null
+++ b/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gigamove.rz.rwth-aachen.de/shibboleth">
+    <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://gigamove.rz.rwth-aachen.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
+MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
+LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
+wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
+JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
+pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
+VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
+K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
+alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
+ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
+vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
+YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
+bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
+60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
+z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
+MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
+LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
+wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
+JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
+pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
+VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
+K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
+alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
+ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
+vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
+YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
+bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
+60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
+z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Gigamove - RWTH Aachen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://gigamove.rz.rwth-aachen.de/help</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Guido</GivenName>
+      <SurName>Bunsen</SurName>
+      <EmailAddress>servicedesk@rz.rwth-aachen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.fu-berlin.de.xml b/swamid-interfederations-2.0/identity.fu-berlin.de.xml
new file mode 100644
index 00000000..865ee627
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.fu-berlin.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.fu-berlin.de/idp-fub">
+    <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">fu-berlin.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
+cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
+AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
+KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
+MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
+A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
+MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
+mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
+VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
+nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
+g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
+Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
+pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
+FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
+MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
+RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
+rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
+PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
+57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
+LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
+5Av8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
+cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
+AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
+KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
+MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
+A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
+MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
+mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
+VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
+nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
+g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
+Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
+pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
+FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
+MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
+RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
+rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
+PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
+57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
+LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
+5Av8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/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.fu-berlin.de/idp-fub/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.fu-berlin.de/idp-fub/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">fu-berlin.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
+cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
+AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
+KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
+MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
+A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
+MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
+mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
+VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
+nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
+g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
+Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
+pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
+FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
+MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
+RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
+rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
+PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
+57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
+LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
+5Av8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
+cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
+AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
+KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
+MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
+A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
+MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
+mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
+VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
+nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
+g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
+Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
+pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
+FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
+MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
+RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
+rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
+PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
+57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
+LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
+5Av8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/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">Freie Universität Berlin</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Steffen</GivenName>
+      <SurName>Hofmann</SurName>
+      <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Hans</GivenName>
+      <SurName>Benedict</SurName>
+      <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
new file mode 100644
index 00000000..8742af97
--- /dev/null
+++ b/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.hrz.uni-kassel.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idm.hrz.uni-kassel.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idm.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGcYVzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
+Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
+CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDc1MDMyWhcNMTMwNjA0MDc1
+MDMyWjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
+bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRt
+Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3BD0wA5kA3SikAQ6YcM3F6neb0XSF5pjO3RHIXzzFIb8srPOsZdJKlZfM6CN
+dVbR7e19j4BkoKBvkjAvKqAcC3bw1vCZVh0m25Xm8XwrUGgefS+bkcVCN30ExAP7
+Xf1melL3UwFNUafkD6gAbtSnuHwpbn1xK0h3tT1BO0CzUPGUNw0Dpm5gEZ1GB65a
+mM4ZftaRo9KG52OPSIzXh5ENS6L/kI0S7Po7kSrQjNnt2OWZe6gdxNgZowxsNpnk
+JAsJYv1mIvLpQ3cmZGwKp7CQzAAqeYAbvUkxa/B+0Xpu4tkt67qhBI+Ci3poX5JR
+vc7sichzh/ndueq5/+ncwG9YwwIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBT2AJWxeDMJqYj+BZXkSuy4/AqT/zAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
+l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
+bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
+YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAGD5o
+yg5wbZkdaU/7yN6Z3Z/MBRRjWcHiEoMYBWcjVzJTYtEtvP0Eb6jQClW5m1BDs+G6
+D6O9e9FNXi26K3x/2QU6jwexkfd5vzrxwCTeJOW/9KiUq0xXcf7uc7sniGse4WhE
+oDhDaSGp+1f4yC6LFgdPggYIA4SK94mhDFIS6XoDQpAPU1fhENbxs1kb5bnvTmMe
+8lWIthsgEv4MBfoHBk+Ilb6zxjA/2GhTLRObQuthcxS2l5VFuThkoOv3QYobW5yu
+zcNFhgo8JRFEAH41DNd2QiwgwdfrQOqgWqUbJP4JZ2CyM7W9Aw9uPezzM4Aj8hFD
+GCdlg18LEvx13ba5EQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/Artifact" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">idm.hrz.uni-kassel.de</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Peter</GivenName>
+      <SurName>Zanger</SurName>
+      <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
new file mode 100644
index 00000000..c17bb853
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-rt.ph-ludwigsburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rt.ph-ludwigsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
+gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
+BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
+2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
+tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
+tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
+DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
+wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
+9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
+gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
+RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
+OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
+1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
+zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
+bbuICC2tb/mG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
+gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
+BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
+2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
+tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
+tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
+DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
+wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
+9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
+gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
+RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
+OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
+1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
+zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
+bbuICC2tb/mG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.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-rt.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-rt.ph-ludwigsburg.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">rt.ph-ludwigsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
+gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
+BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
+2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
+tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
+tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
+DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
+wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
+9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
+gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
+RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
+OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
+1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
+zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
+bbuICC2tb/mG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
+gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
+BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
+2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
+tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
+tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
+DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
+wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
+9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
+gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
+RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
+OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
+1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
+zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
+bbuICC2tb/mG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.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">PH Ludwigsburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">PH Ludwigsburg - Campus Reutlingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Christoph</GivenName>
+      <SurName>List</SurName>
+      <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Eberhard</GivenName>
+      <SurName>Ostertag</SurName>
+      <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml b/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
new file mode 100644
index 00000000..7567fcf7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsb-muenchen.de/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
+G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
+ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
+CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
+MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
+BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
+azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
+ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
+XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
+cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
+GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
+mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
+dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
+WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
+bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
+c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
+ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
+McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
+PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
+xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
+elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
+3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elektra-idp.bsb-muenchen.de:8443/shibboleth/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsb-muenchen.de/shibboleth/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
+G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
+ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
+CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
+MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
+BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
+azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
+ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
+XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
+cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
+GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
+mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
+dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
+WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
+bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
+c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
+ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
+McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
+PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
+xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
+elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
+3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsb-muenchen.de:8443/shibboleth/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">BSB München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://elektra.bsb-muenchen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Wunderle</GivenName>
+      <SurName>Heinrich</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Wunderle</GivenName>
+      <SurName>Heinrich</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de.xml b/swamid-interfederations-2.0/idp.dfn-cert.de.xml
new file mode 100644
index 00000000..de44452f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dfn-cert.de.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIjCCBAqgAwIBAgIECgy5XDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMfREZO
+LUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0wNzAzMDYxMDAwNDdaFw0x
+MjAzMDQxMDAwNDdaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VSVCBT
+ZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiKvnbL
+nPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH7r1P
+OSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5wgZr
+lZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiCvqZh
+3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7HKhni
+/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGjggIC
+MIIB/jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8GA1Ud
+IwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMCAGA1UdEQQZMBeBFXdlYm1hc3Rl
+ckBkZm4tY2VydC5kZTCBowYDVR0fBIGbMIGYMEqgSKBGhkRodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDBKoEigRoZEaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tY2VydC1z
+ZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgbwGCCsGAQUFBwEB
+BIGvMIGsMFQGCCsGAQUFBzAChkhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1j
+ZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwVAYI
+KwYBBQUHMAKGSGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2Vydmlj
+ZXMtZ21iaC1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEADblakZvUL5nbzFPnAhhrNvBDBcv0RgVS72S2xuDZhxpXQS9CK9hR6ZYy
+KD382AtI4MXM30Jo/tRtnB6O/jMoZ+SWROe0PhYFw6jGgOEfp9iGdi8FCXWp7O4+
+ctzn9c+jheJi0FaB3nPxLQUaNlV49g0rIEPXsqBkhT3V7Q+Mol8XB/D/geKwMGwr
+hjKb/SBTEKdhw3oU03dA+Nq0ArEkv6cNtl7SissdLrldlO0+RrErxoRoMENWyRRM
+kxizoRL67fo5CD8AlSb0NXkF5q9pcE9lRxvKfB2/xz4TcVtUcZwr6qP8ezmaf56m
+D/A7NPOzlDHnSCXZk6Hgsm2ng5GGfA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIjCCBAqgAwIBAgIECgy5XDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMfREZO
+LUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0wNzAzMDYxMDAwNDdaFw0x
+MjAzMDQxMDAwNDdaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VSVCBT
+ZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiKvnbL
+nPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH7r1P
+OSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5wgZr
+lZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiCvqZh
+3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7HKhni
+/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGjggIC
+MIIB/jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8GA1Ud
+IwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMCAGA1UdEQQZMBeBFXdlYm1hc3Rl
+ckBkZm4tY2VydC5kZTCBowYDVR0fBIGbMIGYMEqgSKBGhkRodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDBKoEigRoZEaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tY2VydC1z
+ZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgbwGCCsGAQUFBwEB
+BIGvMIGsMFQGCCsGAQUFBzAChkhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1j
+ZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwVAYI
+KwYBBQUHMAKGSGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2Vydmlj
+ZXMtZ21iaC1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEADblakZvUL5nbzFPnAhhrNvBDBcv0RgVS72S2xuDZhxpXQS9CK9hR6ZYy
+KD382AtI4MXM30Jo/tRtnB6O/jMoZ+SWROe0PhYFw6jGgOEfp9iGdi8FCXWp7O4+
+ctzn9c+jheJi0FaB3nPxLQUaNlV49g0rIEPXsqBkhT3V7Q+Mol8XB/D/geKwMGwr
+hjKb/SBTEKdhw3oU03dA+Nq0ArEkv6cNtl7SissdLrldlO0+RrErxoRoMENWyRRM
+kxizoRL67fo5CD8AlSb0NXkF5q9pcE9lRxvKfB2/xz4TcVtUcZwr6qP8ezmaf56m
+D/A7NPOzlDHnSCXZk6Hgsm2ng5GGfA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/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-cert.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIjCCBAqgAwIBAgIECgy5XDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMfREZO
+LUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0wNzAzMDYxMDAwNDdaFw0x
+MjAzMDQxMDAwNDdaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VSVCBT
+ZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiKvnbL
+nPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH7r1P
+OSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5wgZr
+lZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiCvqZh
+3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7HKhni
+/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGjggIC
+MIIB/jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8GA1Ud
+IwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMCAGA1UdEQQZMBeBFXdlYm1hc3Rl
+ckBkZm4tY2VydC5kZTCBowYDVR0fBIGbMIGYMEqgSKBGhkRodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDBKoEigRoZEaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tY2VydC1z
+ZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgbwGCCsGAQUFBwEB
+BIGvMIGsMFQGCCsGAQUFBzAChkhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1j
+ZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwVAYI
+KwYBBQUHMAKGSGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2Vydmlj
+ZXMtZ21iaC1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEADblakZvUL5nbzFPnAhhrNvBDBcv0RgVS72S2xuDZhxpXQS9CK9hR6ZYy
+KD382AtI4MXM30Jo/tRtnB6O/jMoZ+SWROe0PhYFw6jGgOEfp9iGdi8FCXWp7O4+
+ctzn9c+jheJi0FaB3nPxLQUaNlV49g0rIEPXsqBkhT3V7Q+Mol8XB/D/geKwMGwr
+hjKb/SBTEKdhw3oU03dA+Nq0ArEkv6cNtl7SissdLrldlO0+RrErxoRoMENWyRRM
+kxizoRL67fo5CD8AlSb0NXkF5q9pcE9lRxvKfB2/xz4TcVtUcZwr6qP8ezmaf56m
+D/A7NPOzlDHnSCXZk6Hgsm2ng5GGfA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIjCCBAqgAwIBAgIECgy5XDANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMfREZO
+LUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0wNzAzMDYxMDAwNDdaFw0x
+MjAzMDQxMDAwNDdaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VSVCBT
+ZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiKvnbL
+nPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH7r1P
+OSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5wgZr
+lZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiCvqZh
+3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7HKhni
+/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGjggIC
+MIIB/jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8GA1Ud
+IwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMCAGA1UdEQQZMBeBFXdlYm1hc3Rl
+ckBkZm4tY2VydC5kZTCBowYDVR0fBIGbMIGYMEqgSKBGhkRodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2Nh
+Y3JsLmNybDBKoEigRoZEaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tY2VydC1z
+ZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgbwGCCsGAQUFBwEB
+BIGvMIGsMFQGCCsGAQUFBzAChkhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi1j
+ZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwVAYI
+KwYBBQUHMAKGSGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2Vydmlj
+ZXMtZ21iaC1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEADblakZvUL5nbzFPnAhhrNvBDBcv0RgVS72S2xuDZhxpXQS9CK9hR6ZYy
+KD382AtI4MXM30Jo/tRtnB6O/jMoZ+SWROe0PhYFw6jGgOEfp9iGdi8FCXWp7O4+
+ctzn9c+jheJi0FaB3nPxLQUaNlV49g0rIEPXsqBkhT3V7Q+Mol8XB/D/geKwMGwr
+hjKb/SBTEKdhw3oU03dA+Nq0ArEkv6cNtl7SissdLrldlO0+RrErxoRoMENWyRRM
+kxizoRL67fo5CD8AlSb0NXkF5q9pcE9lRxvKfB2/xz4TcVtUcZwr6qP8ezmaf56m
+D/A7NPOzlDHnSCXZk6Hgsm2ng5GGfA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.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">DFN-CERT Services GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Reimer</GivenName>
+      <SurName>Karlsen-Masur</SurName>
+      <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Reimer</GivenName>
+      <SurName>Karlsen-Masur</SurName>
+      <EmailAddress>dfnpca@dfn-cert.de</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..14fcb48c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dfn.de.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <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,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
+ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
+MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
+VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
+ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
+boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
+567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
+TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
+EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
+6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
+o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
+wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
+HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
+cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
+mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
+LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
+6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
+IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
+wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
+1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
+3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <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,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
+ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
+MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
+VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
+ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
+boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
+567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
+TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
+EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
+6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
+o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
+wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
+HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
+cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
+mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
+LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
+6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
+IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
+wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
+1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
+3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
+</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"/>
+      <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="encryption">
+        <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,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
+ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
+MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
+VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
+ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
+boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
+567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
+TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
+EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
+6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
+o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
+wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
+HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
+cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
+mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
+LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
+6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
+IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
+wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
+1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
+3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <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,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEDR/jMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0ZWxs
+ZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0wODEwMjMxMTUz
+MDdaFw0xMzEwMjIxMTUzMDdaMFIxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4t
+VmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRMwEQYDVQQDEwppZHAu
+ZGZuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTWL0k7ANsvg
+boiSQK6IbJXcuxb4lrcs3uKdJvQlKAH4oWu/oY+g/xqERlOqftjL3g36F979O+pF
+567VjG40X2XULfZ/BnKlk5nFPshgUUAY1d5ppc7QooyBWdISIyfxjEX9DKlFJ9P4
+TflqX6m9jWxx8nXokP5foewJrV5HpxYsv1W6t0AbxN4PB8rr60g2ip7ZH9Cu6Rh4
+EsG0kxhV59jewU8re0nRaRFl8Lgarj8EHTHq55C1N0tZyChmxnGYOsDX/bhon4KY
+6wHP94fTUN5O3z+cd4drDD+rfRBq/6sLVLfYz9rn5b0MFsglTrneaLEA46iVHt8L
+o0G5etpxAQIDAQABo4IB2zCCAdcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRQGdtpn+tg3/5k
+wx6PG/fkY367+zAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAdBgNV
+HREEFjAUgRJob3RsaW5lQGFhaS5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwv
+Z19jYWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZl
+cmVpbi1ncy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCB
+mjBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWlu
+LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAMVD5IkagXQC9CeMLaumWt9r
+6smb/4qonPlNUACp3Dbr/QAnZvNj6haJgGKJ7YpFnijXaq6AtsMUsQ3iOLjHodDP
+IhGUv0Q+GuuSr+jmNsRST81UkrJm+wUk5R3jQMTOIWD3qdqV7g4y5xZB/7Xt1ItJ
+wLNyazdIM4hRjJOwMA7asa0O09Cf/iwHuCo5SAFgfj4Y3RUe80A07rIQkZKXkumV
+1PbZw1Cy1bYxzecOAzRI1rSivyDMPW0YC79qCB/8QssLbU8pjfyfBNQui28ZkIst
+3wRjq+vPHe87TOxiDI4QR9IBwMIk6zTL67iH35se5LUp+qdvAtWBLf0/iYNwVWY=
+</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">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ulrich</GivenName>
+      <SurName>Kähler</SurName>
+      <EmailAddress>kaehler@dfn.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Raoul</GivenName>
+      <SurName>Borenius</SurName>
+      <EmailAddress>hotline@aai.dfn.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml b/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
new file mode 100644
index 00000000..4a7e4cda
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-loerrach.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-loerrach.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
+MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
+POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
+31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
+i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
+LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
+eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
+AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
+aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
+cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
+AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
+tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
+NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
+sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
+LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
+B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
+MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
+POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
+31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
+i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
+LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
+eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
+AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
+aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
+cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
+AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
+tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
+NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
+sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
+LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
+B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-loerrach.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-loerrach.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">dhbw-loerrach.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
+MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
+POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
+31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
+i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
+LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
+eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
+AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
+aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
+cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
+AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
+tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
+NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
+sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
+LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
+B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
+MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
+POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
+31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
+i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
+LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
+eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
+AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
+aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
+cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
+AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
+LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
+tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
+NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
+sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
+LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
+B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.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">DHBW Lörrach</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DHBW Lörrach</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dhbw-loerrach.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Peter</GivenName>
+      <SurName>Schwindt</SurName>
+      <EmailAddress>schwindt@dhbw-loerrach.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml b/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
new file mode 100644
index 00000000..47600553
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-mannheim.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-mannheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
+MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
+B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
+FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
+QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
+wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
+vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
+AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
+EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
+YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
+hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
+YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
+MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
+ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
+u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
+zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
+7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
++hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
+Tw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-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.dhbw-mannheim.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-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">dhbw-mannheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
+MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
+B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
+FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
+QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
+wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
+vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
+AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
+EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
+YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
+hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
+YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
+MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
+ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
+u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
+zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
+7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
++hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
+Tw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-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">DHBW Mannheim IDP</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DHBW Mannheim</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dhbw-mannheim.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Matthias</GivenName>
+      <SurName>Weinbrenner</SurName>
+      <EmailAddress>weinbrenner@dhbw-mannheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-vs.de.xml b/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
new file mode 100644
index 00000000..74694e27
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-vs.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-vs.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
+ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
+L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
+7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
+z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
+DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
+vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
+Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
+aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
+zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
+xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
+BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
+9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
+WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
+uxD/wQ4p7Q==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
+ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
+L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
+7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
+z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
+DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
+vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
+Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
+aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
+zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
+xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
+BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
+9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
+WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
+uxD/wQ4p7Q==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.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.dhbw-vs.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-vs.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">dhbw-vs.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
+ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
+L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
+7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
+z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
+DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
+vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
+Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
+aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
+zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
+xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
+BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
+9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
+WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
+uxD/wQ4p7Q==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
+ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
+L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
+7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
+z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
+DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
+vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
+Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
+aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
+zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
+xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
+BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
+9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
+WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
+uxD/wQ4p7Q==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.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">Duale Hochschule BW</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DHBW-VS</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dhbw-vs.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Speck</SurName>
+      <EmailAddress>Thomas.Speck@dhbw-vs.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..3f52dfd6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dir.garr.it.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<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>
+                            MIID9DCCAtygAwIBAgICAo8wDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCSVQx
+                            DTALBgNVBAoTBEdBUlIxJTAjBgNVBAMTHEdBUlIgQ2VydGlmaWNhdGlvbiBBdXRo
+                            b3JpdHkwHhcNMDkwNDIyMTE0NzM4WhcNMTAwNDIyMTE0NzM4WjBZMQswCQYDVQQG
+                            EwJJVDENMAsGA1UEChMER0FSUjENMAsGA1UECxMER0FSUjESMBAGA1UECxMJRGly
+                            ZXppb25lMRgwFgYDVQQDEw9pZHAuZGlyLmdhcnIuaXQwgZ8wDQYJKoZIhvcNAQEB
+                            BQADgY0AMIGJAoGBAM7hBxyIaxYTW5zAn5aMFgpNKspBPXvH0gGRNm0PxC2Kl1F8
+                            Nv1v4PNiNJbuqRBPVI9P9QF7Zsi/rrj1yJ/7HJZUDucR4UKJNoBVmaHCfv9Cwuqf
+                            j41tAKZ5FYgPIqBmVMgzEDlgd418pMxMQVIgMjnhKcEFvr7+8zjaJCgbKhOfAgMB
+                            AAGjggFeMIIBWjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDA0BgNVHSUE
+                            LTArBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAq
+                            BgNVHR8EIzAhMB+gHaAbhhlodHRwOi8vY2EuZ2Fyci5pdC9jcmwuZGVyMBgGA1Ud
+                            IAQRMA8wDQYLKwYBBAGBzH4KAQEwHQYDVR0OBBYEFBKFfnuwqm9Z5ftrk2qEjVRG
+                            W2bPMGsGA1UdIwRkMGKAFEycwpTm+6i4nMRBU9vMLca8XOF2oUekRTBDMQswCQYD
+                            VQQGEwJJVDENMAsGA1UEChMER0FSUjElMCMGA1UEAxMcR0FSUiBDZXJ0aWZpY2F0
+                            aW9uIEF1dGhvcml0eYIBADAyBgNVHREEKzApgg9pZHAuZGlyLmdhcnIuaXSBFnN5
+                            c3RlbS5zdXBwb3J0QGdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEBABx4HUXsoswa
+                            E5HACLrQ9/U1YUZXcMpHS2ahEKYrKHbL0v7P8ccXnoYrMJOYV8jCGuVZ8T/oLiXl
+                            S8CSCzA2NLqFrwW2HPVes0Nu+2NSQLe54ICBA7dOyFDNvCZIli7HXH4NF3Ha9tty
+                            znCPn/r+X5sECThHgdCn8dcLoFYTpu8GeyOVoAKqL5ftUIJeTA1liODMFvOsC/bg
+                            jcpQuz8VlvB2vqdOY15IjeNxUSHttto48S28fvmRXH/X1eUNeYTgkJY0y3wymbzF
+                            gmDyI+GB/1RDdKg4K4UCo34gUSPWcoM8XlTik9BnjkEbqVl84GxajIVdnEaLwCGy
+                            EAOTMLmtMG0=
+                        </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>
+                            MIID9DCCAtygAwIBAgICAo8wDQYJKoZIhvcNAQEFBQAwQzELMAkGA1UEBhMCSVQx
+                            DTALBgNVBAoTBEdBUlIxJTAjBgNVBAMTHEdBUlIgQ2VydGlmaWNhdGlvbiBBdXRo
+                            b3JpdHkwHhcNMDkwNDIyMTE0NzM4WhcNMTAwNDIyMTE0NzM4WjBZMQswCQYDVQQG
+                            EwJJVDENMAsGA1UEChMER0FSUjENMAsGA1UECxMER0FSUjESMBAGA1UECxMJRGly
+                            ZXppb25lMRgwFgYDVQQDEw9pZHAuZGlyLmdhcnIuaXQwgZ8wDQYJKoZIhvcNAQEB
+                            BQADgY0AMIGJAoGBAM7hBxyIaxYTW5zAn5aMFgpNKspBPXvH0gGRNm0PxC2Kl1F8
+                            Nv1v4PNiNJbuqRBPVI9P9QF7Zsi/rrj1yJ/7HJZUDucR4UKJNoBVmaHCfv9Cwuqf
+                            j41tAKZ5FYgPIqBmVMgzEDlgd418pMxMQVIgMjnhKcEFvr7+8zjaJCgbKhOfAgMB
+                            AAGjggFeMIIBWjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDA0BgNVHSUE
+                            LTArBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAq
+                            BgNVHR8EIzAhMB+gHaAbhhlodHRwOi8vY2EuZ2Fyci5pdC9jcmwuZGVyMBgGA1Ud
+                            IAQRMA8wDQYLKwYBBAGBzH4KAQEwHQYDVR0OBBYEFBKFfnuwqm9Z5ftrk2qEjVRG
+                            W2bPMGsGA1UdIwRkMGKAFEycwpTm+6i4nMRBU9vMLca8XOF2oUekRTBDMQswCQYD
+                            VQQGEwJJVDENMAsGA1UEChMER0FSUjElMCMGA1UEAxMcR0FSUiBDZXJ0aWZpY2F0
+                            aW9uIEF1dGhvcml0eYIBADAyBgNVHREEKzApgg9pZHAuZGlyLmdhcnIuaXSBFnN5
+                            c3RlbS5zdXBwb3J0QGdhcnIuaXQwDQYJKoZIhvcNAQEFBQADggEBABx4HUXsoswa
+                            E5HACLrQ9/U1YUZXcMpHS2ahEKYrKHbL0v7P8ccXnoYrMJOYV8jCGuVZ8T/oLiXl
+                            S8CSCzA2NLqFrwW2HPVes0Nu+2NSQLe54ICBA7dOyFDNvCZIli7HXH4NF3Ha9tty
+                            znCPn/r+X5sECThHgdCn8dcLoFYTpu8GeyOVoAKqL5ftUIJeTA1liODMFvOsC/bg
+                            jcpQuz8VlvB2vqdOY15IjeNxUSHttto48S28fvmRXH/X1eUNeYTgkJY0y3wymbzF
+                            gmDyI+GB/1RDdKg4K4UCo34gUSPWcoM8XlTik9BnjkEbqVl84GxajIVdnEaLwCGy
+                            EAOTMLmtMG0=
+                        </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.dlr.de.xml b/swamid-interfederations-2.0/idp.dlr.de.xml
new file mode 100644
index 00000000..5066374a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dlr.de.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dlr.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dlr.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dlr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
+bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
+SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
+N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
+ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
+ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
+druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
+WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
+ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
+X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
+zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
+qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
+65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
+HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
+lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
+7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
+IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
++8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
+yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
+HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.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.dlr.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dlr.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dlr.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dlr.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">dlr.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.dlr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
+bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
+SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
+N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
+ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
+ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
+druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
+WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
+ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
+X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
+zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
+qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
+65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
+HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
+lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
+7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
+IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
++8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
+yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
+HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.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">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dlr.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Gert</GivenName>
+      <SurName>Ohme</SurName>
+      <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gert</GivenName>
+      <SurName>Ohme</SurName>
+      <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml b/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
new file mode 100644
index 00000000..f26e4bad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-duesseldorf.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-duesseldorf.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
+BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
+MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
+MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
+Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
+BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
+FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
+VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
+C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
+Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
+kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
+KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
+T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
+ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
+Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
+ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
+q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
+VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
+8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
+7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
+PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
+HAfOyhCqg1OPKRSVyFh7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
+BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
+MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
+MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
+Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
+BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
+FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
+VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
+C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
+Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
+kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
+KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
+T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
+ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
+Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
+ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
+q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
+VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
+8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
+7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
+PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
+HAfOyhCqg1OPKRSVyFh7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-duesseldorf.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-duesseldorf.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
+BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
+MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
+MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
+Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
+BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
+FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
+VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
+C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
+Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
+kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
+KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
+T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
+ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
+Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
+ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
+q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
+VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
+8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
+7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
+PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
+HAfOyhCqg1OPKRSVyFh7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
+REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
+BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
+MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
+MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
+Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
+BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
+FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
+VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
+C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
+Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
+kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
+KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
+T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
+ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
+YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
+Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
+ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
+q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
+VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
+8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
+7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
+PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
+HAfOyhCqg1OPKRSVyFh7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.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">Fachhochschule Düsseldorf</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Fachhochschule Düsseldorf</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fh-duesseldorf.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Roland</GivenName>
+      <SurName>Conradshaus</SurName>
+      <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Roland</GivenName>
+      <SurName>Conradshaus</SurName>
+      <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-offenburg.de.xml b/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
new file mode 100644
index 00000000..ada60c39
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-offenburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-offenburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
+Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
+OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
+cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
+Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
+MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
+k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
+pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
+oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
+aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
+vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
+GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
+E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
+YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
+BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
+OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
+ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
+c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
+3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
+a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
+Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
+OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
+cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
+Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
+MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
+k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
+pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
+oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
+aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
+vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
+GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
+E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
+YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
+BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
+OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
+ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
+c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
+3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
+a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.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.fh-offenburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-offenburg.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-offenburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
+Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
+OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
+cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
+Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
+MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
+k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
+pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
+oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
+aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
+vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
+GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
+E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
+YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
+BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
+OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
+ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
+c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
+3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
+a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
+Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
+OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
+cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
+Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
+MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
+k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
+pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
+oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
+aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
+vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
+GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
+E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
+YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
+dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
+BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
+OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
+ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
+c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
+3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
+a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.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">Hochschule Offenburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Offenburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fh-offenburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Mirko</GivenName>
+      <SurName>Guldner</SurName>
+      <EmailAddress>guldner@fh-offenburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Obermann</SurName>
+      <EmailAddress>christian.obermann@fh-offenburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-trier.de.xml b/swamid-interfederations-2.0/idp.fh-trier.de.xml
new file mode 100644
index 00000000..eefaea3c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fh-trier.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-trier.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-trier.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
+YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
+DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
+MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
+ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
+HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
+6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
+WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
+3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
+25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
+Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
+DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
+VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
+aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
+cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
+BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
+cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
+g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
+tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
+RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
+c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
+0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
+YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
+DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
+MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
+ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
+HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
+6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
+WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
+3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
+25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
+Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
+DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
+VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
+aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
+cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
+BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
+cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
+g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
+tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
+RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
+c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
+0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.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.fh-trier.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-trier.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-trier.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
+YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
+DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
+MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
+ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
+HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
+6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
+WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
+3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
+25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
+Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
+DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
+VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
+aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
+cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
+BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
+cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
+g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
+tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
+RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
+c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
+0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fh-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
+YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
+DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
+MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
+ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
+HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
+6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
+WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
+3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
+25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
+Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
+DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
+VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
+aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
+cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
+BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
+cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
+g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
+tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
+RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
+c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
+0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.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">Hochschule Trier Rechenzentrum (r/ft)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Fachhochschule Trier</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fh-trier.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ralf</GivenName>
+      <SurName>Becker</SurName>
+      <EmailAddress>beckerr@fh-trier.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ralf</GivenName>
+      <SurName>Becker</SurName>
+      <EmailAddress>beckerr@fh-trier.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fraunhofer.de.xml b/swamid-interfederations-2.0/idp.fraunhofer.de.xml
new file mode 100644
index 00000000..cfce972b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fraunhofer.de.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fraunhofer.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fraunhofer.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
+VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
+ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
+MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
+AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
+A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
+8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
+AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
+KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
+pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
+r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
+Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
+WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
+ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
+ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
+BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
+LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
+Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
+BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
+ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
+YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
+VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
+KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
+LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
+8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
+20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
+WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
+DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
+h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.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.fraunhofer.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fraunhofer.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">fraunhofer.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
+VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
+ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
+MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
+AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
+A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
+8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
+AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
+KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
+pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
+r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
+Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
+WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
+ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
+ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
+BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
+LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
+Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
+BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
+ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
+YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
+VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
+KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
+LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
+8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
+20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
+WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
+DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
+h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.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">Fraunhofer-Gesellschaft</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Fraunhofer-Gesellschaft</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fraunhofer.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Björn</GivenName>
+      <SurName>Vollmer</SurName>
+      <EmailAddress>bjoern.vollmer@zv.fraunhofer.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hebis.de.xml b/swamid-interfederations-2.0/idp.hebis.de.xml
new file mode 100644
index 00000000..e83b731e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hebis.de.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hebis.de/uni-frankfurt">
+    <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-frankfurt.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hebis.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
+LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
+EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
+dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
+BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
+YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
+dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
+aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
+xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
+vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
+GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
+2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
+7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
+b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
+YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
+OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
+2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
+DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
+hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
+jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
+DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hebis.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
+LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
+EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
+dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
+BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
+YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
+dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
+aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
+xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
+vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
+GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
+2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
+7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
+b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
+YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
+OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
+2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
+DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
+hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
+jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
+DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/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.hebis.de/uni-frankfurt/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hebis.de/uni-frankfurt/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-frankfurt.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hebis.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
+LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
+EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
+dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
+BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
+YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
+dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
+aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
+xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
+vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
+GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
+2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
+7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
+b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
+YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
+OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
+2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
+DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
+hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
+jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
+DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hebis.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
+LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
+EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
+dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
+BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
+YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
+dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
+aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
+xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
+vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
+GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
+2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
+7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
+b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
+YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
+OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
+2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
+DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
+hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
+jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
+DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/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">Universität Frankfurt am Main (Johann Wolfgang Goethe-Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Frankfurt</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Axel</GivenName>
+      <SurName>Dörrer</SurName>
+      <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Axel</GivenName>
+      <SurName>Dörrer</SurName>
+      <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hochschule-bc.de.xml b/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
new file mode 100644
index 00000000..e6166c18
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hochschule-bc.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hochschule-bc.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
+Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
+hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
+MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
+dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
+QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
+b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
+cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
+A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
+zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
+15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
+16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
+3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
+HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
+Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
+gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
+b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
+/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
+dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
+jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
+T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
++rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hochschule-bc.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hochschule-bc.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">hochschule-bc.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
+Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
+hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
+MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
+dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
+QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
+b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
+cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
+A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
+zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
+15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
+16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
+3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
+HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
+Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
+gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
+b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
+/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
+dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
+jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
+T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
++rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.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">Hochschule Biberach</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Biberach</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hochschule-bc.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Roland</GivenName>
+      <SurName>Forderer</SurName>
+      <EmailAddress>forderer@hochschule-bc.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>DFN-AAI</GivenName>
+      <SurName>Support</SurName>
+      <EmailAddress>hotline@aai.dfn.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
new file mode 100644
index 00000000..2a2bd8fa
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hrz.uni-kassel.de/shibboleth-idp">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
+Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
+CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
+NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
+bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
+Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
+lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
+gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
+fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
+pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
+9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
+l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
+bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
+YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
+akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
+6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
+E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
+WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
+dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
+NvJcsfo5OyQT/KjEqA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
+Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
+CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
+NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
+bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
+Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
+lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
+gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
+fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
+pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
+9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
+l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
+bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
+YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
+akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
+6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
+E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
+WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
+dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
+NvJcsfo5OyQT/KjEqA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hrz.uni-kassel.de/shibboleth-idp/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
+Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
+CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
+NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
+bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
+Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
+lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
+gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
+fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
+pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
+9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
+l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
+bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
+YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
+akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
+6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
+E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
+WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
+dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
+NvJcsfo5OyQT/KjEqA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
+REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
+Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
+CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
+NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
+bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
+Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
+lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
+gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
+fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
+pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
+9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
+l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
+bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
+SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
+YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
+akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
+6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
+E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
+WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
+dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
+NvJcsfo5OyQT/KjEqA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Kassel</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Peter</GivenName>
+      <SurName>Zanger</SurName>
+      <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Peter</GivenName>
+      <SurName>Zanger</SurName>
+      <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
new file mode 100644
index 00000000..0b762ceb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-esslingen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-esslingen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <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>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
+DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
+IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
+37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
+Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
+id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
+LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
+CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
+A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
+ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
+Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
+18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
+1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
+IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
+7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
+td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <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>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
+DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
+IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
+37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
+Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
+id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
+LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
+CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
+A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
+ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
+Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
+18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
+1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
+IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
+7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
+td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+</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>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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"/>
+    </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 use="signing">
+        <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>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
+DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
+IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
+37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
+Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
+id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
+LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
+CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
+A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
+ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
+Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
+18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
+1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
+IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
+7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
+td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <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>MIIFMTCCBBmgAwIBAgIEDmrJ1DANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTA5MDcwMTExNDUwOFoX
+DTEyMDYzMDExNDUwOFowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hzY2h1
+bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
+ZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++IyIw
+IC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEGQxar
+37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRITMCp
+Ij8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsmj9x8
+id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHMFh3a
+LisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4IB9TCCAfEwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3
+CgMDBglghkgBhvhCBAEwHQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8G
+A1UdIwQYMBaAFONbF7zWLDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1h
+ZG1pbkBocy1lc3NsaW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3Js
+LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4t
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1
+Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAUOq3J7g8KIhllj9REZGArIDDEDTKHz4v+nxK
+18HU/a++spk27pnJDZqQFTN59KxpzQaqVgrjoXTxIDib8VJlIKG0ddp2qKFXqKN2
+1mW9A3AYKFASEQB+x7BWsf74g62dn/tIptf190Cb8E8r1kbWTHILw+gGLwd2tOk8
+IQQsBIAbMkd3rtoJ0OqTTwab6qI0SX/BBtRsm9AuSTNohwevDr2ApSbw7Qv+cH2v
+7QI0ZhesW7/xE7O2eaue8Z7rjyHxjNNJOK3Tfj9wZzmjdM+tWl/c6q+DngcClxVw
+td8exW1+V+2Uh+asbfnUK6XED+qXWm7ze4CmNCE/XOviMn+ylw==
+</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>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Hochschule Esslingen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Esslingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Herbert</GivenName>
+      <SurName>Wiese</SurName>
+      <EmailAddress>Herbert.Wiese@hs-esslingen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Martin</GivenName>
+      <SurName>Schmid</SurName>
+      <EmailAddress>admin@hs-esslingen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-harz.de.xml b/swamid-interfederations-2.0/idp.hs-harz.de.xml
new file mode 100644
index 00000000..e449d409
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-harz.de.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-harz.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-harz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-harz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
+RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
+SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
+ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
+Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
+aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
+kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
+MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
+V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
+XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
+vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
+djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
+cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
+AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
+r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
+uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
+ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
+ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
+NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-harz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
+RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
+SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
+ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
+Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
+aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
+kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
+MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
+V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
+XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
+vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
+djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
+cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
+AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
+r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
+uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
+ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
+ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
+NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/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-harz.de/shibboleth/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/Redirect/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST-SimpleSign/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">hs-harz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-harz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
+RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
+SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
+ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
+Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
+aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
+kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
+MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
+V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
+XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
+vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
+djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
+cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
+AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
+r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
+uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
+ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
+ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
+NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-harz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
+RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
+SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
+ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
+Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
+aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
+kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
+MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
+V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
+XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
+vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
+djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
+cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
+AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
+r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
+uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
+ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
+ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
+NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/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">Hochschule Harz</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">HS-Harz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-harz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Friedemann</GivenName>
+      <SurName>Hass</SurName>
+      <EmailAddress>fhass@hs-harz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Sandra</GivenName>
+      <SurName>Thielert</SurName>
+      <EmailAddress>sthielert@hs-harz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml b/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
new file mode 100644
index 00000000..0eec5088
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-magdeburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-magdeburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
+KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
+A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
+SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
+NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
+bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
+YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
+cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
+1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
+1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
+ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
+qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
+0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
+FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
+6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
+mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
+Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
+vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
+bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
+P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
+38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
+XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.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-magdeburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-magdeburg.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">hs-magdeburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
+KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
+A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
+SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
+NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
+bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
+YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
+cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
+1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
+1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
+ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
+qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
+0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
+FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
+6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
+mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
+Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
+vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
+bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
+P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
+38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
+XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.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">Hochschule Magdeburg-Stendal</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Magdeburg-Stendal</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-magdeburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Peter</GivenName>
+      <SurName>Mörl</SurName>
+      <EmailAddress>peter.moerl@hs-magdeburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-zigr.de.xml b/swamid-interfederations-2.0/idp.hs-zigr.de.xml
new file mode 100644
index 00000000..169e4cd4
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.hs-zigr.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-zigr.de/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
+RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
+CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
+ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
+ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
+A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
+kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
+PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
+iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
+fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
+LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
+IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
+VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
+dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
+bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
+eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
+alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
+teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
+2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
+QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
+olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de/shibboleth-idp/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-zigr.de/shibboleth-idp/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
+RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
+CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
+ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
+ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
+A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
+kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
+PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
+iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
+fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
+LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
+IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
+VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
+dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
+bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
+eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
+alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
+teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
+2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
+QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
+olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de:8443/shibboleth-idp/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Hochschule Zittau / Görlitz</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Zittau/Goerlitz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-zigr.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Thomas</GivenName>
+      <SurName>Jaeger</SurName>
+      <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Jaeger</SurName>
+      <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml b/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
new file mode 100644
index 00000000..7ed284ea
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.htwg-konstanz.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">htwg-konstanz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
+MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
+x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
+XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
+7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
+ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
+1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
+AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
+2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
+c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
+SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
+Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
+DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
+yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
+i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
+wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
+qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.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.htwg-konstanz.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.htwg-konstanz.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">htwg-konstanz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
+MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
+x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
+XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
+7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
+ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
+1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
+AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
+2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
+c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
+ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
+SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
+Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
+L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
+DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
+yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
+i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
+wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
+qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.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">Hochschule Konstanz Technik, Wirtschaft und Gestaltung</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">HTWG Konstanz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.htwg-konstanz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Konrad</GivenName>
+      <SurName>Mauz</SurName>
+      <EmailAddress>hostmaster@htwg-konstanz.de</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 480dde14..9e00c0c6 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
@@ -1,10 +1,15 @@
 <?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="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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIEDyTTjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/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>
+        <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
@@ -30,37 +35,78 @@ bApMu6sgKRf6qPW/MZUAmW0VXjce+W3elGohc4D0MSVHXZQN48Y3S0Jktc5CVC46
 HzxN+4WnjMpVFIB8d5PoL8Nck6vuKvM/IzQbUKym9VC29qwxUIyzG7/f6OuzwXtJ
 xPmwm/Z3/0myg08CF/awdegYuOaq2NBWi7ZvJefTvunuzhwv8LcNPon2mFomUq+E
 VVbh+FSPaIx4RWUSCYsAX8B5Yx9FCb0PJ8HnemcVzgyA8x4Qh5JYbdo0FiNI04LE
-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>schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+99YJ9IIzYQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </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">Institut für Deutsche Sprache</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ids-mannheim.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Oliver</GivenName>
+      <SurName>Schonefeld</SurName>
+      <EmailAddress>schonefeld@ids-mannheim.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Andreas</GivenName>
+      <SurName>Witt</SurName>
+      <EmailAddress>witt@ids-mannheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml b/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
new file mode 100644
index 00000000..4cfa74d7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itmc.tu-dortmund.de:8443/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-dortmund.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
+CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
+CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
+N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
+VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
+nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
+Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
+xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
+pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
+MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
+m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
+O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
+ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
+BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
+C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
+rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
+9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
+r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
+CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
+CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
+N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
+VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
+nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
+Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
+xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
+pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
+MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
+m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
+O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
+ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
+BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
+C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
+rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
+9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
+r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/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.itmc.tu-dortmund.de:8443/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/Redirect/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST-SimpleSign/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">tu-dortmund.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
+CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
+CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
+N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
+VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
+nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
+Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
+xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
+pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
+MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
+m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
+O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
+ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
+BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
+C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
+rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
+9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
+r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
+CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
+CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
+N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
+aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
+VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
+nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
+Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
+xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
+pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
+MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
+m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
+O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
+ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
+BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
+C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
+rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
+9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
+r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/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">Universität Dortmund (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Dortmund (Technische Universität)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-dortmund.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Stefan</GivenName>
+      <SurName>Rapp</SurName>
+      <EmailAddress>stefan.rapp@tu-dortmund.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Arne</GivenName>
+      <SurName>von Irmer</SurName>
+      <EmailAddress>Arne.vonIrmer@tu-dortmund.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
new file mode 100644
index 00000000..6e359960
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.its.fz-juelich.de/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>
+        <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,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFWzCCBEOgAwIBAgIED6HU3DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEqMCgG
+A1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJKoZI
+hvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEwMDIyMjEwMDcwOFoXDTEzMDIy
+MTEwMDcwOFowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2Vz
+dGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdzemVu
+dHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGljaC5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfMWbVl7AvMbD+BfKDh
+HMdNgoG1fMJw6/g9biZnFKY6Ey4tBfgpYY0pjA1tShXcFO6oBf0QIcuHlLeBjEhA
+0Oa+D+MBLI59Mtdt+qP4Vnb19U+b2eOKzWTzIPzv2YouUF7vWTVZ0zfvrBcz2v0n
+t3NcC+pT5eym+j0g6FkNSU1A56CPUE3As8Kct1MvQvPmzYpOdMqQgiZ2sJbdTHS0
+pDLbycEAqu3+io5W+MG/6dtljXGk7liYirZAeWEiLWlz0lrFU50FlFtwnVDCQr0L
+LIh6MNSawg4zvv8YsT/599OWbOJB0svrPbIpPH7dVZFpESZynns9j//13q/t+kXM
+F0cCAwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQt
+MCsGCCsGAQUFBwMCBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0G
+A1UdDgQWBBTqWpf+8Fn95qfWILim5B9Quq6KKDAfBgNVHSMEGDAWgBQgvXGJpckq
+My8R4B/llCZWDxECJTAmBgNVHREEHzAdgRtqLmhlaWRidWVjaGVsQGZ6LWp1ZWxp
+Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBlgYIKwYBBQUHAQEE
+gYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAOFrB/uQdtRVoT2Sy+lMN6cf7eeASn9xOSvqJzuiHkEN2
+rPsjzAxzCjRw0FmhsCAyub1f3dfaAc0HBxuCWoX1BBt81MQE4bae+gJ8V9P+aE49
+45PBub7vjB0FDMNpFOMHU8n02nR2Kfy0fiQwoLkq7P75pjKcN7FuKAZU4Q/FEHM+
+VGER1Mfxr5AxLqDkeOJHlaUN7Won1+UA/FKakoQ3gLCQdWT+8dc3Km1YVDNrsqJk
+NNx585kM4ZBHDCe1JLeGC2SUqiIQXIdpjO1fQFEb9xZiifS/xRod28uXwFy2cPzG
+sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
+</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,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFWzCCBEOgAwIBAgIED6HU3DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEqMCgG
+A1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJKoZI
+hvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEwMDIyMjEwMDcwOFoXDTEzMDIy
+MTEwMDcwOFowgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4tV2Vz
+dGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdzemVu
+dHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGljaC5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfMWbVl7AvMbD+BfKDh
+HMdNgoG1fMJw6/g9biZnFKY6Ey4tBfgpYY0pjA1tShXcFO6oBf0QIcuHlLeBjEhA
+0Oa+D+MBLI59Mtdt+qP4Vnb19U+b2eOKzWTzIPzv2YouUF7vWTVZ0zfvrBcz2v0n
+t3NcC+pT5eym+j0g6FkNSU1A56CPUE3As8Kct1MvQvPmzYpOdMqQgiZ2sJbdTHS0
+pDLbycEAqu3+io5W+MG/6dtljXGk7liYirZAeWEiLWlz0lrFU50FlFtwnVDCQr0L
+LIh6MNSawg4zvv8YsT/599OWbOJB0svrPbIpPH7dVZFpESZynns9j//13q/t+kXM
+F0cCAwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQt
+MCsGCCsGAQUFBwMCBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0G
+A1UdDgQWBBTqWpf+8Fn95qfWILim5B9Quq6KKDAfBgNVHSMEGDAWgBQgvXGJpckq
+My8R4B/llCZWDxECJTAmBgNVHREEHzAdgRtqLmhlaWRidWVjaGVsQGZ6LWp1ZWxp
+Y2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+emotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDCBlgYIKwYBBQUHAQEE
+gYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNh
+L3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAOFrB/uQdtRVoT2Sy+lMN6cf7eeASn9xOSvqJzuiHkEN2
+rPsjzAxzCjRw0FmhsCAyub1f3dfaAc0HBxuCWoX1BBt81MQE4bae+gJ8V9P+aE49
+45PBub7vjB0FDMNpFOMHU8n02nR2Kfy0fiQwoLkq7P75pjKcN7FuKAZU4Q/FEHM+
+VGER1Mfxr5AxLqDkeOJHlaUN7Won1+UA/FKakoQ3gLCQdWT+8dc3Km1YVDNrsqJk
+NNx585kM4ZBHDCe1JLeGC2SUqiIQXIdpjO1fQFEb9xZiifS/xRod28uXwFy2cPzG
+sHHG41oCYI2nl5gfLE7CWL9I2fqXJdCANgc5PavIug==
+</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">Forschungszentrum Jülich GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.fz-juelich.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Jens</GivenName>
+      <SurName>Heidbüchel</SurName>
+      <EmailAddress>j.heidbuechel@fz-juelich.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Jens</GivenName>
+      <SurName>Heidbüchel</SurName>
+      <EmailAddress>j.heidbuechel@fz-juelich.de</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..59143ef0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lrz.de.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/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>
+        <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>
+      <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">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.lrz-muenchen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ralf</GivenName>
+      <SurName>Ebner</SurName>
+      <EmailAddress>shibboleth@lrz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ralf</GivenName>
+      <SurName>Ebner</SurName>
+      <EmailAddress>shibboleth@lrz.de</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..669157c3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.niif.hu.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<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>
+            <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>
+            </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>
+            <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.niif.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niif.hu/idp/profile/SAML2/POST/SLO"/>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/idp/profile/SAML2/Redirect/SLO"/>
+            <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.niif.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/idp/profile/SAML2/Redirect/SSO"/>
+            <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niif.hu/idp/profile/SAML2/POST/SSO"/>
+        </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>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-freiburg.de.xml b/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
new file mode 100644
index 00000000..208c3165
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-freiburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-freiburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
+cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
+MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
+cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
+MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
+4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
+SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
+KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
+j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
+W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
+AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
+HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
+O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
+ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
+BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
+LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
+RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
++C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
+ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
+skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.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.ph-freiburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-freiburg.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">ph-freiburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
+cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
+MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
+cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
+MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
+4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
+SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
+KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
+j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
+W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
+AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
+HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
+O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
+ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
+BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
+LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
+RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
++C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
+ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
+skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.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">Pädagogische Hochschule Freiburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">PH-Freiburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-freiburg.de/zik/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Stephan</GivenName>
+      <SurName>Lauffer</SurName>
+      <EmailAddress>lauffer@ph-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Martin</GivenName>
+      <SurName>Duffner</SurName>
+      <EmailAddress>duffner@ph-freiburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-gmuend.de.xml b/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
new file mode 100644
index 00000000..e777f9a1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-gmuend.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gmuend.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
+YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
+U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
+aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
+LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
+AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
+ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
+IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
+cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
+aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
+ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
+Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
+YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
+z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
+ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
+wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
+LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
+Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
+BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
+ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
+RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
+ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
+/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
+t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
+LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
+YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
+U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
+aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
+LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
+AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
+ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
+IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
+cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
+aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
+ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
+Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
+YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
+z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
+ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
+wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
+LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
+Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
+BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
+ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
+RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
+ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
+/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
+t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
+LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.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.ph-gmuend.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-gmuend.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">ph-gmuend.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
+YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
+U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
+aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
+LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
+AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
+ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
+IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
+cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
+aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
+ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
+Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
+YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
+z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
+ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
+wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
+LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
+Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
+BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
+ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
+RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
+ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
+/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
+t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
+LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
+YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
+U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
+aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
+LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
+AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
+ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
+IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
+cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
+aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
+ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
+Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
+YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
+z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
+ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
+wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
+LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
+Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
+BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
+ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
+AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
+RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
+ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
+/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
+t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
+LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.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">PH Schwaebisch Gmuend</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">PH Schwäbisch Gmünd</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-gmuend.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Christoph</GivenName>
+      <SurName>List</SurName>
+      <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Markus</GivenName>
+      <SurName>Opferkuch</SurName>
+      <EmailAddress>markus.opferkuch@ph-gmuend.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml b/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
new file mode 100644
index 00000000..1e9b231c
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-karlsruhe.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
+MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
+a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
+OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
+c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
+T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
+qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
+4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
+Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
+beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
+AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
+GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
+aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
+AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
+4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
+Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
+7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
+N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
+kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
+MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
+a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
+OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
+c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
+T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
+qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
+4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
+Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
+beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
+AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
+GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
+aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
+AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
+4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
+Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
+7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
+N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
+kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.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.ph-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-karlsruhe.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">ph-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
+MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
+a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
+OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
+c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
+T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
+qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
+4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
+Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
+beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
+AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
+GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
+aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
+AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
+4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
+Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
+7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
+N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
+kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
+RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
+MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
+a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
+OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
+EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
+c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
+T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
+qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
+4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
+Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
+beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
+AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
+GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
+aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
+AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
+4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
+Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
+7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
+N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
+kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.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">PH Karlsruhe</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">PH Karlsruhe</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-karlsruhe.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Christoph</GivenName>
+      <SurName>List</SurName>
+      <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Helmut</GivenName>
+      <SurName>Filipp</SurName>
+      <EmailAddress>filipp@ph-karlsruhe.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
new file mode 100644
index 00000000..bd7bfe6e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-ludwigsburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.ph-ludwigsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
+gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
+BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
+GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
+lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
+MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
+lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
+xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
+KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
+goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
+MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
+BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
+aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
+FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
+z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
+DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
+s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
+p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
+dPUEeVju
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
+gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
+BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
+GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
+lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
+MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
+lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
+xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
+KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
+goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
+MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
+BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
+aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
+FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
+z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
+DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
+s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
+p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
+dPUEeVju
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.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.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-ludwigsburg.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">lb.ph-ludwigsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
+gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
+BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
+GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
+lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
+MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
+lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
+xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
+KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
+goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
+MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
+BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
+aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
+FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
+z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
+DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
+s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
+p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
+dPUEeVju
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
+c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
+YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
+UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
+LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
+gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
+BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
+Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
+BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
+GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
+lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
+MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
+lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
+xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
+KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
+goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
+MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
+BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
+aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
+FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
+z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
+DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
+s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
+p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
+dPUEeVju
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.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">PH Ludwigsburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">PH Ludwigsburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Christoph</GivenName>
+      <SurName>List</SurName>
+      <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Eberhard</GivenName>
+      <SurName>Ostertag</SurName>
+      <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
+    </ContactPerson>
+  </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..77ec6589
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ppke.hu.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<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>
+            <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>
+            </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">Pázmány Péter Katolikus Egyetem</OrganizationDisplayName>
+            <OrganizationDisplayName xml:lang="en">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>cstamas@digitus.itk.ppke.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <SurName>Csillag Tamás</SurName>
+            <EmailAddress>cstamas@digitus.itk.ppke.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <SurName>Csillag Tamás</SurName>
+            <EmailAddress>cstamas@digitus.itk.ppke.hu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reutlingen-university.de.xml b/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
new file mode 100644
index 00000000..730d2506
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reutlingen-university.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">reutlingen-university.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
+b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
+Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
+cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
+L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
+VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
+YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
+GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
+pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
+Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
+m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
+aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
+AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
+dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
+dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
+7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
+mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
+E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
+IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
+B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
+kanNbZOkV2o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
+b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
+Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
+cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
+L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
+VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
+YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
+GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
+pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
+Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
+m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
+aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
+AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
+dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
+dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
+7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
+mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
+E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
+IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
+B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
+kanNbZOkV2o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.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.reutlingen-university.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reutlingen-university.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">reutlingen-university.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
+b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
+Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
+cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
+L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
+VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
+YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
+GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
+pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
+Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
+m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
+aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
+AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
+dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
+dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
+7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
+mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
+E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
+IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
+B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
+kanNbZOkV2o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
+b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
+Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
+cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
+L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
+VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
+YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
+GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
+pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
+Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
+m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
+aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
+AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
+dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
+dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
+7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
+mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
+E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
+IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
+B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
+kanNbZOkV2o=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.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">Hochschule Reutlingen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Reutlingen University / Hochschule Reutlingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.reutlingen-university.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Wolfgang</GivenName>
+      <SurName>Honigberger</SurName>
+      <EmailAddress>wolfgang.honigberger@reutlingen-university.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Michael</GivenName>
+      <SurName>Thalmann</SurName>
+      <EmailAddress>michael.thalmann@reutlingen-university.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
new file mode 100644
index 00000000..5db76898
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
+RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
+bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
+QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
+MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
+A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
+A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
+LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
+P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
+MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
+wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
+P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
+VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
+dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
+YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
+CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
+BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
+PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
+++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
+zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
+K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
+mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.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.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
+RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
+bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
+QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
+MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
+A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
+A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
+LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
+P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
+MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
+wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
+P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
+VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
+dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
+AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
+YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
+CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
+BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
+PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
+++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
+zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
+K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
+mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität zu Köln</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität zu Köln</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-koeln.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Beate</GivenName>
+      <SurName>Schlesiona</SurName>
+      <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Beate</GivenName>
+      <SurName>Schlesiona</SurName>
+      <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml b/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
new file mode 100644
index 00000000..83b07282
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rz.uni-hohenheim.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hohenheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
+YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
+bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
+aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
+nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
+MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
+dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
+CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
+SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
+Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
+Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
+iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
+/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
+bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
+aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
+OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
+S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
+XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
+KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
+dQrQJapTFuFmBHtINb8rzGQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
+YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
+bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
+aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
+nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
+MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
+dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
+CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
+SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
+Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
+Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
+iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
+/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
+bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
+aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
+OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
+S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
+XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
+KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
+dQrQJapTFuFmBHtINb8rzGQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.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.rz.uni-hohenheim.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rz.uni-hohenheim.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rz.uni-hohenheim.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-hohenheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
+YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
+bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
+aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
+nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
+MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
+dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
+CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
+SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
+Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
+Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
+iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
+/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
+bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
+aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
+OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
+S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
+XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
+KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
+dQrQJapTFuFmBHtINb8rzGQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
+YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
+bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
+aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
+nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
+A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
+MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
+dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
+CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
+SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
+Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
+Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
+iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
+/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
+bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
+aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
+OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
+S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
+XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
+KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
+dQrQJapTFuFmBHtINb8rzGQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.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">Universität Hohenheim</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Hohenheim</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.uni-hohenheim.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Steffen</GivenName>
+      <SurName>Bücheler</SurName>
+      <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Steffen</GivenName>
+      <SurName>Bücheler</SurName>
+      <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Björn</GivenName>
+      <SurName>Breiner</SurName>
+      <EmailAddress>bjoern.breiner@uni-hohenheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu.xml b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
new file mode 100644
index 00000000..1d81a743
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
+JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
+AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
+MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
+YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
+S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
+c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
+HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
+rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
+OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
+wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
+NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
+g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
+kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
+KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
+AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
+6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
+NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
+shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
+I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
+RK42gc2r8jP4hr5kQZhmEkk0
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
+JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
+AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
+MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
+YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
+S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
+c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
+HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
+rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
+OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
+wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
+NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
+g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
+kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
+KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
+AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
+6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
+NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
+shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
+I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
+RK42gc2r8jP4hr5kQZhmEkk0
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</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.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/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">kit.edu</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
+JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
+AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
+MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
+YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
+S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
+c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
+HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
+rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
+OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
+wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
+NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
+g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
+kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
+KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
+AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
+6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
+NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
+shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
+I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
+RK42gc2r8jP4hr5kQZhmEkk0
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
+dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
+JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
+AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
+MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
+YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
+S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
+c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
+HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
+rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
+OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
+wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
+NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
+g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
+4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
+kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
+KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
+AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
+6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
+NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
+shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
+I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
+RK42gc2r8jP4hr5kQZhmEkk0
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu: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">Karlsruhe Institute of Technology (KIT)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Michael</GivenName>
+      <SurName>Simon</SurName>
+      <EmailAddress>simon@kit.edu</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Sebastian</GivenName>
+      <SurName>Labitzke</SurName>
+      <EmailAddress>labitzke@kit.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml b/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
new file mode 100644
index 00000000..e416ef98
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-ilmenau.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-ilmenau.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
+RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
+A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
+YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
+EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
+MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
+8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
+gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
+MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
+3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
+NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
+qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
+Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
+dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
+mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
+rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
+/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
+1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
+0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
+s/NTn9EiARtxg0zkLNo=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.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.tu-ilmenau.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-ilmenau.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">tu-ilmenau.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
+RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
+A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
+YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
+EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
+MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
+8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
+gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
+MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
+3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
+NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
+AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
+qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
+Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
+dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
+mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
+rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
+/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
+1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
+0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
+s/NTn9EiARtxg0zkLNo=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.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">Technische Universitaet Ilmenau</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Technische Universität Ilmenau</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-ilmenau.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Jörg</GivenName>
+      <SurName>Deutschmann</SurName>
+      <EmailAddress>joerg.deutschmann@tu-ilmenau.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml b/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
new file mode 100644
index 00000000..eb6d132d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.hsu-hh.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hsu-hh.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
+aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
+RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
+WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
+cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
+aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
+MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
+CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
+QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
+Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
+o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
+NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
+BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
+vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
+MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
+bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
+dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
+RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
+oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
+bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
+s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
+g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
+md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
+aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
+RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
+WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
+cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
+aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
+MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
+CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
+QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
+Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
+o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
+NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
+BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
+vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
+MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
+bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
+dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
+RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
+oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
+bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
+s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
+g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
+md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.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.ub.hsu-hh.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.hsu-hh.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">hsu-hh.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
+aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
+RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
+WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
+cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
+aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
+MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
+CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
+QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
+Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
+o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
+NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
+BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
+vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
+MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
+bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
+dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
+RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
+oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
+bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
+s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
+g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
+md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
+aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
+RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
+WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
+cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
+aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
+MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
+CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
+QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
+Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
+o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
+NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
+BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
+vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
+MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
+bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
+dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
+RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
+oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
+bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
+s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
+g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
+md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.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">Helmut-Schmidt-Universität</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">HSU Hamburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://ub.hsu-hh.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ulrich</GivenName>
+      <SurName>Hahn</SurName>
+      <EmailAddress>idp@hsu-bibliothek.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ulrich</GivenName>
+      <SurName>Hahn</SurName>
+      <EmailAddress>uhahn@hsu-bibliothek.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml b/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
new file mode 100644
index 00000000..b6af786d
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.uni-heidelberg.de">
+    <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-heidelberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
+A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
+ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
+MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
+MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
+ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
+BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
+GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
+F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
+ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
+c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
+WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
+oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
+YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
+C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
+We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
+vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
+jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
+w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
+A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
+ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
+MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
+MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
+ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
+BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
+GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
+F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
+ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
+c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
+WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
+oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
+YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
+C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
+We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
+vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
+jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
+w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.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://heidi.ub.uni-heidelberg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heidi.ub.uni-heidelberg.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-heidelberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
+A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
+ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
+MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
+MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
+ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
+BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
+GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
+F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
+ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
+c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
+WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
+oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
+YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
+C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
+We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
+vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
+jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
+w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
+A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
+ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
+MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
+MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
+ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
+BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
+GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
+F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
+ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
+c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
+WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
+oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
+YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
+LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
+C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
+We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
+vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
+jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
+w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.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">Universität Heidelberg (Ruprecht-Karls-Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Heidelberg - Universitätsbibliothek</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-heidelberg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Leonhard</GivenName>
+      <SurName>Maylein</SurName>
+      <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Leonhard</GivenName>
+      <SurName>Maylein</SurName>
+      <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-bremen.de.xml b/swamid-interfederations-2.0/idp.uni-bremen.de.xml
new file mode 100644
index 00000000..fbb5c0ca
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-bremen.de.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-bremen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bremen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
+aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
+Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
+bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
+GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
+e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
+u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
+FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
+5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
+8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
+edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
+ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
+bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
+cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
+7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
+dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
+oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
+K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
+YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
+WrtCKL4uiSA/ovg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.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.uni-bremen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-bremen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-bremen.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-bremen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
+aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
+Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
+bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
+GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
+e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
+u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
+FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
+5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
+8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
+edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
+ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
+bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
+cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
+YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
+7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
+dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
+oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
+K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
+YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
+WrtCKL4uiSA/ovg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.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">Universität Bremen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Bremen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-bremen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Schlittchen</SurName>
+      <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Christian</GivenName>
+      <SurName>Schlittchen</SurName>
+      <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
new file mode 100644
index 00000000..8464dde6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
+bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
+54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
+Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
+F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
+2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
+nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
+p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
+QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
+MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
+VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
+JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
+oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
+RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
+/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
+bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
+54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
+Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
+F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
+2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
+nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
+p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
+QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
+MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
+VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
+JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
+oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
+RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
+/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.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:persistent</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.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.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-duisburg-essen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
+bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
+54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
+Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
+F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
+2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
+nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
+p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
+QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
+MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
+VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
+JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
+oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
+RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
+/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
+bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
+54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
+Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
+F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
+2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
+nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
+p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
+QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
+MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
+VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
+JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
+oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
+RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
+/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Harald</GivenName>
+      <SurName>Schüler</SurName>
+      <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Harald</GivenName>
+      <SurName>Schüler</SurName>
+      <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-konstanz.de.xml b/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
new file mode 100644
index 00000000..c008db42
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-konstanz.de/shibboleth-idp">
+    <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-konstanz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
+Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
+MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
+BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
+dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
+6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
+8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
+JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
+4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
+I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
+psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
+IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
+A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
+c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
+YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
+zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
+MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
+NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
+DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
+vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
+Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
+MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
+BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
+dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
+6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
+8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
+JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
+4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
+I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
+psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
+IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
+A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
+c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
+YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
+zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
+MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
+NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
+DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
+vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <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>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-konstanz.de/idp2/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-konstanz.de/idp2/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-konstanz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
+Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
+MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
+BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
+dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
+6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
+8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
+JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
+4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
+I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
+psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
+IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
+A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
+c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
+YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
+zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
+MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
+NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
+DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
+vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
+Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
+MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
+BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
+dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
+6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
+8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
+JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
+4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
+I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
+psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
+IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
+A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
+c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
+YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
+zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
+MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
+NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
+DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
+vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Konstanz</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Konstanz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-konstanz.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Michael</GivenName>
+      <SurName>Längle</SurName>
+      <EmailAddress>michael.laengle@uni-konstanz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Markus</GivenName>
+      <SurName>Grandpre</SurName>
+      <EmailAddress>idp@uni-konstanz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Doreen</GivenName>
+      <SurName>Liebenau</SurName>
+      <EmailAddress>idp@uni-konstanz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-mannheim.de.xml b/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
new file mode 100644
index 00000000..1ca01112
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-mannheim.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mannheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
+aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
+dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
+Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
+MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
+MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
+aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
+FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
+E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
+DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
+6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
+05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
+AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
+PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
+gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
+cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
+lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
+bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
+azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
+nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
++/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
+lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
+NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
+aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
+dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
+Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
+MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
+MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
+aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
+FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
+E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
+DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
+6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
+05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
+AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
+PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
+gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
+cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
+lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
+bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
+azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
+nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
++/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
+lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
+NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-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.uni-mannheim.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-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">uni-mannheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
+aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
+dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
+Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
+MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
+MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
+aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
+FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
+E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
+DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
+6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
+05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
+AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
+PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
+gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
+cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
+lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
+bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
+azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
+nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
++/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
+lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
+NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
+aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
+dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
+Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
+MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
+MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
+aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
+FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
+E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
+DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
+6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
+05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
+AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
+PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
+gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
+cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
+dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
+lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
+bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
+azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
+nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
++/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
+lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
+NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-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">Universität Mannheim</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Mannheim</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-mannheim.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Magnus</GivenName>
+      <SurName>Pfeffer</SurName>
+      <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Magnus</GivenName>
+      <SurName>Pfeffer</SurName>
+      <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml b/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
new file mode 100644
index 00000000..dea876a3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-oldenburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-oldenburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
+ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
+RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
+BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
+MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
+ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
+dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
+cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
+JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
+9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
++oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
+em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
+/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
+SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
+6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
+BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
+D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
+lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
+A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
+cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
+ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
+bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
+dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
+BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
+dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
+FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
+wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
+Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
+q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.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.uni-oldenburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-oldenburg.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-oldenburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
+ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
+RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
+BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
+MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
+ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
+dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
+cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
+JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
+9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
++oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
+em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
+/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
+SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
+6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
+BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
+D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
+lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
+A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
+cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
+ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
+bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
+dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
+BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
+dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
+FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
+wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
+Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
+q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.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">Universität Oldenburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Oldenburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-oldenburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Timm</GivenName>
+      <SurName>Stamer</SurName>
+      <EmailAddress>idm@uni-oldenburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ulrich</GivenName>
+      <SurName>Czernik</SurName>
+      <EmailAddress>ulrich.czernik@uni-oldenburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml b/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
new file mode 100644
index 00000000..c60cd6a1
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-stuttgart.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-stuttgart.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
+MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
+cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
+qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
+mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
+ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
+uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
+6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
+FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
+cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
+AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
+qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
+YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
+kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
+7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
+yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
+MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
+cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
+qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
+mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
+ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
+uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
+6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
+FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
+cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
+AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
+qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
+YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
+kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
+7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
+yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.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.uni-stuttgart.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-stuttgart.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-stuttgart.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
+MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
+cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
+qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
+mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
+ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
+uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
+6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
+FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
+cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
+AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
+qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
+YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
+kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
+7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
+yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
+REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
+dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
+MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
+MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
+BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
+VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
+cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
+qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
+mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
+ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
+uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
+6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
+FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
+cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
+AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
+qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
+YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
+kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
+7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
+yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.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">Universität Stuttgart</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>David</GivenName>
+      <SurName>Lutz</SurName>
+      <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>David</GivenName>
+      <SurName>Lutz</SurName>
+      <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml b/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
new file mode 100644
index 00000000..d21ac838
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-tuebingen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
+aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
+QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
+9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
+l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
+9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
+kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
+eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
+4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
+MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
+BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
+Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
+LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
+FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
+0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
+Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
+wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
+9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
+aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
+QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
+9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
+l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
+9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
+kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
+eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
+4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
+MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
+BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
+Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
+LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
+FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
+0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
+Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
+wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
+9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.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-tuebingen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
+aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
+QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
+9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
+l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
+9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
+kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
+eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
+4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
+MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
+BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
+Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
+LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
+FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
+0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
+Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
+wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
+9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
+BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
+aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
+QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
+9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
+l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
+9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
+kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
+eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
+4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
+MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
+BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
+Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
+cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
+LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
+LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
+AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
+FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
+0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
+Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
+wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
+9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.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">Universität Tübingen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Dr. Abele</SurName>
+      <EmailAddress>heinrich.abele@uni-tuebingen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ina</GivenName>
+      <SurName>Müller</SurName>
+      <EmailAddress>ina.mueller@uni-tuebingen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-ulm.de.xml b/swamid-interfederations-2.0/idp.uni-ulm.de.xml
new file mode 100644
index 00000000..cc853252
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-ulm.de.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-ulm.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-ulm.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
+RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
+aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
+MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
+VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
+TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
+noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
++PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
+qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
++j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
+ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
+A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
+M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
+dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
+da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
+KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
+AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
+NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
+jrSXV8bqE4onz+nFV6gyew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
+RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
+aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
+MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
+VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
+TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
+noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
++PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
+qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
++j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
+ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
+A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
+M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
+dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
+da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
+KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
+AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
+NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
+jrSXV8bqE4onz+nFV6gyew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.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.uni-ulm.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-ulm.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-ulm.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
+RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
+aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
+MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
+VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
+TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
+noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
++PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
+qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
++j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
+ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
+A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
+M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
+dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
+da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
+KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
+AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
+NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
+jrSXV8bqE4onz+nFV6gyew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
+RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
+aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
+MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
+VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
+TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
+noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
++PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
+qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
++j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
+ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
+A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
+M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
+dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
+s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
+da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
+KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
+AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
+NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
+jrSXV8bqE4onz+nFV6gyew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.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">Universität Ulm</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Ulm</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-ulm.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Harald</GivenName>
+      <SurName>Däubler</SurName>
+      <EmailAddress>harald.daeubler@uni-ulm.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
new file mode 100644
index 00000000..11d3e48f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
+cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
+DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
+SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
+MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
+IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
+dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
+ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
+Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
+3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
+o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
+uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
+Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
+83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
+HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
+oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
+MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
+ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
+w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
+Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
+7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
+dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
+WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.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-wuppertal.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
+REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
+cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
+DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
+SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
+MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
+IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
+dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
+ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
+Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
+3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
+o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
+uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
+Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
+83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
+HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
+oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
+Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
+aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
+MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
+ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
+w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
+Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
+7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
+dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
+WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.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">Bergische Universität Wuppertal</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Rene</GivenName>
+      <SurName>Zeipelt</SurName>
+      <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Rene</GivenName>
+      <SurName>Zeipelt</SurName>
+      <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml b/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
new file mode 100644
index 00000000..983602b8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wlb-stuttgart.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">wlb-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
+cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
+CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
+WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
+MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
+YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
+c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
+X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
+PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
+pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
+ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
+IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
+jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
+KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
+ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
+oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
+X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
+BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
+QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
+N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
+lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
+K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
+vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.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.wlb-stuttgart.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlb-stuttgart.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">wlb-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
+cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
+CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
+WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
+MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
+YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
+c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
+X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
+PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
+pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
+ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
+IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
+jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
+KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
+ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
+oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
+X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
+BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
+cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
+QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
+N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
+lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
+K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
+vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.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">Württembergische Landesbibliothek Stuttgart</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Württembergische Landesbibliothek Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.wlb-stuttgart.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Jörg</GivenName>
+      <SurName>Oberfell</SurName>
+      <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Jörg</GivenName>
+      <SurName>Oberfell</SurName>
+      <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml b/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
new file mode 100644
index 00000000..575e093f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.hs-augsburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-augsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
+CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
+MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
+Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
+E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
+kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
+VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
+42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
+ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
+aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
+OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
+gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
+BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
+AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
+iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
+dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
+f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
+OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
+AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
+cln+zg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
+CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
+MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
+Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
+E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
+kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
+VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
+42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
+ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
+aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
+OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
+gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
+BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
+AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
+iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
+dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
+f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
+OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
+AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
+cln+zg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hs-augsburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-augsburg.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">hs-augsburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
+CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
+MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
+Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
+E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
+kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
+VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
+42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
+ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
+aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
+OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
+gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
+BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
+AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
+iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
+dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
+f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
+OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
+AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
+cln+zg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
+CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
+MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
+Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
+E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
+kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
+VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
+42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
+ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
+aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
+OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
+gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
+Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
+BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
+aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
+AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
+ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
+iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
+dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
+f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
+OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
+AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
+cln+zg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.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">Hochschule Augsburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Augsburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-augsburg.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Arno</GivenName>
+      <SurName>Schneider</SurName>
+      <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Arno</GivenName>
+      <SurName>Schneider</SurName>
+      <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml b/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
new file mode 100644
index 00000000..542d7592
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hs-furtwangen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-furtwangen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
+Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
+MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
+ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
+IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
+BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
+KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
+OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
+CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
+I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
++t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
+xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
+KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
+bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
+9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
+OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
+DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
+6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
+VcZhsLWUIB6RV8IBFSlHz50=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.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://idp1.hs-furtwangen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-furtwangen.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">hs-furtwangen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
+Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
+MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
+ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
+IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
+BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
+KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
+OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
+CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
+I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
++t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
+xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
+KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
+cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
+bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
+9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
+OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
+DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
+6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
+VcZhsLWUIB6RV8IBFSlHz50=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.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">Hochschule Furtwangen University -IdP 1</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Hendrik</GivenName>
+      <SurName>Kuijs</SurName>
+      <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Bernhard</GivenName>
+      <SurName>Czmiel</SurName>
+      <EmailAddress>czmiel@hs-furtwangen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.jacobs-university.de.xml b/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
new file mode 100644
index 00000000..f0e4a0bb
--- /dev/null
+++ b/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.jacobs-university.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">jacobs-university.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
+VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
+MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
+JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
+AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
+SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
+O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
+kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
+3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
+cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
+EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
+ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
+YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
+r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
+Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
++dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
+IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
+UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.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://idp2.jacobs-university.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.jacobs-university.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">jacobs-university.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
+VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
+MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
+JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
+AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
+SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
+O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
+kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
+3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
+cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
+BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
+EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
+ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
+YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
+cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
+hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
+r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
+Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
++dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
+IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
+UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.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">Jacobs University Bremen gGmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Jacobs University Bremen gGmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.jacobs-university.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Mario</GivenName>
+      <SurName>Kaiser</SurName>
+      <EmailAddress>itsupport@jacobs-university.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Torge</GivenName>
+      <SurName>Schmidt</SurName>
+      <EmailAddress>t.schmidt@jacobs-university.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ieeexplore.ieee.org.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
new file mode 100644
index 00000000..776271bc
--- /dev/null
+++ b/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ieeexplore.ieee.org/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.ieeexplore.ieee.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.ieeexplore.ieee.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIICzjCCAbagAwIBAgIETGv6kTANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDEx5z
+aGliYm9sZXRoLmllZWV4cGxvcmUuaWVlZS5vcmcwHhcNMTAwODE4MTUyMTUzWhcN
+MTMwODE3MTUyMTUzWjApMScwJQYDVQQDEx5zaGliYm9sZXRoLmllZWV4cGxvcmUu
+aWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEZrWYL9uv
+82FE1/gdMiMAddL0u5QamV7JFESacdtR0djeNMeQp39ImWRWN+Asi35T2LQ6qNnV
+0qC8ITjl6LsxTKwhQdn00vpZI+QY6UCMyi6v/AzaU3pJ5SeKwEJUONAk/99n1eqq
+Ohqu+Xgu3a+gvEIKs7k9wDYdPdIqgx7X5d4HnOs5qMqX/o3ocHOL6wHxabETu6ud
+Drr0MBlLDJ3plqbTm/Kh0aWLg9OdRTMjCs4OhjjTe6VYCIZalDUQaHrQbYHANpBe
+YKk6oOf1sG9o+UGnGPzPYejjgpqgEKfQJqaZD+79Vbx3d8bgaLNQyiEGplnlBJeF
+/eHxmsIkTqHhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEaT5SZ8+5dBiaC5bwHW
+qZCySknJOJuZLGfwz7CvHI+WoVzoncsbbv5XFDFxBzWncqZSynpvRcpeFYJ3HFa9
+xXdlL3i1BGC5ujOMF9+adI8QBxQdeKHZ3crUt0GluwxWrzs5o7DlkQyo/Au+VP1r
+noXgNNEyZuEWOUYPa2k2wOHt68EVkjdNHD4SGZwioWZ7RQGgCKF/fH6Q1iSAjGbK
+FOFPwx2bdRXfj+vpOPg+EkAJuPArNxQU+b5T9Utxn4QGmsgcgfwwaJJghKs8vXXY
+a0cuv2eotR3FGr2Dlp2GuqI9GPF2ux/KHpTscEDCK+qidpOrFsW7PIE+ct3mDa76
+BIY=
+</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://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">IEEE</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">IEEEXplore SP</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://ieeexplore.ieee.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tom</GivenName>
+      <SurName>Bruno</SurName>
+      <EmailAddress>tbruno@atypon.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.bmj.com.xml b/swamid-interfederations-2.0/journals.bmj.com.xml
new file mode 100644
index 00000000..5118fa5b
--- /dev/null
+++ b/swamid-interfederations-2.0/journals.bmj.com.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.bmj.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">BMJ Journals</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">BMJ Journals</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://journals.bmj.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kurse.vhb.org.xml b/swamid-interfederations-2.0/kurse.vhb.org.xml
new file mode 100644
index 00000000..275eef61
--- /dev/null
+++ b/swamid-interfederations-2.0/kurse.vhb.org.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurse.vhb.org/sp">
+    <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://kurse.vhb.org/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>kurse.vhb.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
+REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
+QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
+Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
+MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
+LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
+FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
+XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
+DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
+aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
+dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
+3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
+ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
+BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
+bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
+BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
+BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
+dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
+GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
+qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
+PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
+Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
+T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
+FQPShrsE3e4cFw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>kurse.vhb.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
+REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
+MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
+QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
+Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
+MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
+LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
+FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
+XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
+DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
+aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
+dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
+3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
+ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
+BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
+bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
+BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
+BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
+dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
+GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
+qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
+PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
+Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
+T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
+FQPShrsE3e4cFw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Virtuelle Hochschule Bayern</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Virtuelle Hochschule Bayern - Kursprogramm</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://kurse.vhb.org</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ingo</GivenName>
+      <SurName>Müller</SurName>
+      <EmailAddress>technik@vhb.org</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ingo</GivenName>
+      <SurName>Müller</SurName>
+      <EmailAddress>technik@vhb.org</EmailAddress>
+    </ContactPerson>
+  </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..a8786f32
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/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>
+        <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>
+      <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">Universität München (Ludwig-Maximilians-Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität München (LMU)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ralf</GivenName>
+      <SurName>Ebner</SurName>
+      <EmailAddress>shibboleth@lrz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hfwu.de.xml b/swamid-interfederations-2.0/login.hfwu.de.xml
new file mode 100644
index 00000000..0293d096
--- /dev/null
+++ b/swamid-interfederations-2.0/login.hfwu.de.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hfwu.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfwu.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hfwu.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
+dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
+9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
+WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
+Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
+AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
+nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
+55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
+SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
+dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
+B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
+GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
+pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
+bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
+hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
+Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
+BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
+Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
+Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
+ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
+poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
+Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
+oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
+qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
+PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
+gpAuyo+UjGaG1AhdwVL3
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hfwu.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
+dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
+9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
+WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
+Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
+AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
+nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
+55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
+SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
+dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
+B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
+GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
+pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
+bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
+hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
+Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
+BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
+Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
+Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
+ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
+poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
+Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
+oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
+qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
+PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
+gpAuyo+UjGaG1AhdwVL3
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.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://login.hfwu.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hfwu.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hfwu.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hfwu.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">hfwu.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hfwu.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
+dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
+9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
+WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
+Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
+AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
+nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
+55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
+SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
+dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
+B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
+GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
+pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
+bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
+hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
+Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
+BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
+Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
+Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
+ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
+poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
+Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
+oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
+qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
+PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
+gpAuyo+UjGaG1AhdwVL3
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hfwu.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
+RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
+dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
+9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
+WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
+Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
+AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
+nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
+55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
+SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
+dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
+B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
+GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
+pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
+bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
+hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
+Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
+BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
+Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
+Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
+ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
+poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
+Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
+oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
+qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
+PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
+gpAuyo+UjGaG1AhdwVL3
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.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">Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">HfWU Nuertingen-Geislingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hfwu.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Clemens</GivenName>
+      <SurName>Sanwald</SurName>
+      <EmailAddress>clemens.sanwald@hfwu.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hs-ulm.de.xml b/swamid-interfederations-2.0/login.hs-ulm.de.xml
new file mode 100644
index 00000000..92b5b806
--- /dev/null
+++ b/swamid-interfederations-2.0/login.hs-ulm.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hs-ulm.de/shibboleth-idp">
+    <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-ulm.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hs-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
+FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
+KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
+MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
+bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
+BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
+RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
+0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
+LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
+HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
+NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
+DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
+SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
+FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
+NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
+ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
+NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
+8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
+aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
+vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
+hGoTVw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hs-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
+FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
+KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
+MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
+bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
+BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
+RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
+0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
+LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
+HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
+NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
+DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
+SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
+FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
+NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
+ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
+NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
+8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
+aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
+vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
+hGoTVw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de/shibboleth-idp/SAML2/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/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.hs-ulm.de/shibboleth-idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hs-ulm.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ulm.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hs-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
+FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
+KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
+MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
+bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
+BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
+RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
+0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
+LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
+HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
+NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
+DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
+SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
+FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
+NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
+ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
+NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
+8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
+aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
+vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
+hGoTVw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.hs-ulm.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
+FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
+KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
+MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
+bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
+BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
+RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
+0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
+LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
+HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
+NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
+DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
+SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
+FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
+NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
+bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
+KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
+ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
+NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
+8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
+aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
+vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
+hGoTVw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de: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="de">Hochschule Ulm (Hochschule für Technik)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Ulm</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-ulm.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Thomas</GivenName>
+      <SurName>Gloeckler</SurName>
+      <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Gloeckler</SurName>
+      <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
+    </ContactPerson>
+  </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..24926ee8
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ntua.gr.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.gr/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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntua.gr</shibmd:Scope>
+            </Extensions>
+            <KeyDescriptor use="signing">
+                <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>
+            <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 use="signing">
+                <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>
+            <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.portal.uni-muenchen.de.xml b/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
new file mode 100644
index 00000000..cfa354a4
--- /dev/null
+++ b/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.portal.uni-muenchen.de/ea">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
+KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
+BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
+NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
+aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
+BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
+EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
+iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
+4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
+EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
+cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
+rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
+MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
+bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
+BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
+QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
+UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
+Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
+U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
+YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
+KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
+BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
+NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
+QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
+aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
+BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
+EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
+iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
+4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
+EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
+cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
+rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
+MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
+bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
+BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
+QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
+UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
+Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
+U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
+YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">LMU Erstanmeldung</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">LMU Erstanmeldung</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://login.portal.uni-muenchen.de/ea</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Andrej</GivenName>
+      <SurName>Kolontai</SurName>
+      <EmailAddress>edv.security@verwaltung.uni-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
new file mode 100644
index 00000000..ccc63936
--- /dev/null
+++ b/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.rz.rwth-aachen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rwth-aachen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
+MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
+SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
+CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
+R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
+mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
+jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
+AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
+GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
+oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
+fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
+jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
+3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
+T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
+sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
+MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
+SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
+CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
+R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
+mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
+jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
+AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
+GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
+oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
+fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
+jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
+3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
+T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
+sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.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://login.rz.rwth-aachen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.rz.rwth-aachen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.rz.rwth-aachen.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">rwth-aachen.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
+MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
+SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
+CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
+R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
+mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
+jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
+AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
+GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
+oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
+fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
+jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
+3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
+T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
+sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
+MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
+SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
+CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
+R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
+mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
+jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
+AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
+GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
+oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
+LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
+BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
+fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
+jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
+3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
+T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
+sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.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">RWTH Aachen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.rwth-aachen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Bischof</SurName>
+      <EmailAddress>bischof@rz.rwth-aachen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Wilfred</GivenName>
+      <SurName>Gasper</SurName>
+      <EmailAddress>sso@rz.rwth-aachen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.slub-dresden.de.xml b/swamid-interfederations-2.0/login.slub-dresden.de.xml
new file mode 100644
index 00000000..e61f877f
--- /dev/null
+++ b/swamid-interfederations-2.0/login.slub-dresden.de.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.slub-dresden.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">slub-dresden.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.slub-dresden.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
+MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
+fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
+4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
+fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
+RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
+BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
+MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
+kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
+ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
+/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
+csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
+7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
+tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
+RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
++IJTcEjcKl3hPdIic+E=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.slub-dresden.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
+MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
+fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
+4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
+fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
+RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
+BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
+MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
+kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
+ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
+/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
+csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
+7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
+tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
+RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
++IJTcEjcKl3hPdIic+E=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.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://login.slub-dresden.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.slub-dresden.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">slub-dresden.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.slub-dresden.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
+MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
+fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
+4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
+fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
+RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
+BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
+MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
+kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
+ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
+/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
+csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
+7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
+tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
+RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
++IJTcEjcKl3hPdIic+E=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login.slub-dresden.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
+MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
+fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
+4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
+fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
+RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
+BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
+MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
+kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
+ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
+Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
+MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
+/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
+csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
+7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
+tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
+RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
++IJTcEjcKl3hPdIic+E=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.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">SLUB Dresden</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">SLUB Dresden</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.slub-dresden.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Falk</GivenName>
+      <SurName>Niederlein</SurName>
+      <EmailAddress>niederl@slub-dresden.de</EmailAddress>
+    </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..9e9e9eac
--- /dev/null
+++ b/swamid-interfederations-2.0/login.terena.org.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEVDCCAzygAwIBAgIJANm7yUGYaeG1MA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQKEwdTVVJGbmV0MREwDwYDVQQLEwhTZXJ2aWNlczEZMBcG
+A1UEAxMQRmVkZXJhdGllIEJlaGVlcjEqMCgGCSqGSIb3DQEJARYbZmVkZXJhdGll
+LWJlaGVlckBzdXJmbmV0Lm5sMB4XDTA4MDYwNTE1MDgyMVoXDTIzMDYwMjE1MDgy
+MVoweTELMAkGA1UEBhMCTkwxEDAOBgNVBAoTB1NVUkZuZXQxETAPBgNVBAsTCFNl
+cnZpY2VzMRkwFwYDVQQDExBGZWRlcmF0aWUgQmVoZWVyMSowKAYJKoZIhvcNAQkB
+FhtmZWRlcmF0aWUtYmVoZWVyQHN1cmZuZXQubmwwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/x+YuMaHyS3xeogfBB6hWrL4Frp+KzOuu4IixfhMHz3xI
+G5l7p2aNV8UrEXevOwMWCgMNxjfSLdZBgNhR14GBh2cVGCx9f/wUtB86scmkP3Pr
+RLoZWu/EIY6MEbgET3D3tkdGuVejQwwhJTlK2xxWHtEdEL5abjYLveDg6Lb6z9od
+ljFevylBMZO+5LwTjpa3+B+07oMZr2sV1yjsG2BEBwTFz4XZzJAabeK9UO836qhN
+ptktjffoCNen33tNCjzqci4wzgQef3CNA/Ef0tMKGotdldKC6FtHvXixmVY5RKUK
+Iutm8sRwne8XYqrD54BAgXZQ0ZovxFbvGhA77YXxAgMBAAGjgd4wgdswHQYDVR0O
+BBYEFJNoYjIYUrDN/h1+9BZYOTk7jQBNMIGrBgNVHSMEgaMwgaCAFJNoYjIYUrDN
+/h1+9BZYOTk7jQBNoX2kezB5MQswCQYDVQQGEwJOTDEQMA4GA1UEChMHU1VSRm5l
+dDERMA8GA1UECxMIU2VydmljZXMxGTAXBgNVBAMTEEZlZGVyYXRpZSBCZWhlZXIx
+KjAoBgkqhkiG9w0BCQEWG2ZlZGVyYXRpZS1iZWhlZXJAc3VyZm5ldC5ubIIJANm7
+yUGYaeG1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI4IxrYPwwjJ
+D9gO1Vzt8ByeQaRe+V0Mv5Ox9RlcXV33WX8Ny8hqUS4/kjs9v7JOuOw7TRop/4QJ
+IAv/LEXH9B+hQ96zdLGMCcHI2crWF8l0yZ/DtgkpdlcyS7dNbjLtedtmgrOMSQub
+LE02tqoSUR491mQbRuXD49+kJsHXZH8I1YZqOShzPZ7+ksvnBd64txhef8OBlCzE
+elT60nOC3Jm8k3i0HwPcCYfDrh6+MJfC2dvfgktAcyu8rm1Q/ZelxaaXok17wUKg
+D8nDrVCOfTND1RCGcqJ3YVjYDhBrMdK+5NSuC5KOJUpVZbKgTOilnOM7B/Os8HJC
+fxLkDyGV/oQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20"/>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Flogin.terena.org%252Fidp%252Fsaml2%252Fidp%252Fmetadata.php"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.surfnet.nl/federate/saml20/https%253A%252F%252Flogin.terena.org%252Fidp%252Fsaml2%252Fidp%252Fmetadata.php"/>
+    </IDPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="en">TERENA Secretariat</OrganizationName>
+      <OrganizationDisplayName xml:lang="en">TERENA Secretariat</OrganizationDisplayName>
+      <OrganizationURL xml:lang="en">http://www.surffederatie.nl</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <SurName>AAI Beheer</SurName>
+      <EmailAddress>aai-beheer@surfnet.nl</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>SURFfederatie Beheer</GivenName>
+      <EmailAddress>federatie-beheer@surfnet.nl</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login2.hs-mittweida.de.xml b/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
new file mode 100644
index 00000000..2ec25e8e
--- /dev/null
+++ b/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login2.hs-mittweida.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-mittweida.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
+REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
+ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
+bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
+cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
+MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
+YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
+dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
+ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
+Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
+/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
+Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
+Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
+56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
+nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
+rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
+VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
+cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
+AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
+YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
+qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
+7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
+PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
++NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
+REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
+ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
+bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
+cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
+MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
+YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
+dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
+ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
+Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
+/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
+Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
+Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
+56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
+nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
+rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
+VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
+cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
+AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
+YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
+qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
+7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
+PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
++NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.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://login2.hs-mittweida.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.hs-mittweida.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.hs-mittweida.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">hs-mittweida.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
+REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
+ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
+bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
+cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
+MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
+YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
+dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
+ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
+Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
+/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
+Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
+Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
+56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
+nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
+rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
+VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
+cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
+AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
+YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
+qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
+7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
+PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
++NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
+REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
+ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
+bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
+cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
+MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
+YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
+dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
+ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
+Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
+/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
+Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
+Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
+56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
+nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
+rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
+VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
+cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
+AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
+hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
+YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
+qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
+7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
+PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
++NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.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">Hochschule Mittweida - University of Applied Sciences</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Mittweida</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-mittweida.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Matthias</GivenName>
+      <SurName>Lühr</SurName>
+      <EmailAddress>luehr@hs-mittweida.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Jens</GivenName>
+      <SurName>Rabe</SurName>
+      <EmailAddress>rabe@hs-mittweida.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
new file mode 100644
index 00000000..4540d14e
--- /dev/null
+++ b/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mylogin.uni-freiburg.de/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
+MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
+HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
+bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
+C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
+PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
+YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
+JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
+vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
+rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
+MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
+cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
+QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
+i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
+tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
+w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
+2ERqngwPct4mRDp6O58BlZ4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
+MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
+HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
+bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
+C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
+PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
+YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
+JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
+vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
+rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
+MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
+cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
+QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
+i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
+tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
+w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
+2ERqngwPct4mRDp6O58BlZ4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mylogin.uni-freiburg.de/idp/mylogin/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
+MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
+HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
+bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
+C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
+PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
+YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
+JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
+vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
+rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
+MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
+cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
+QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
+i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
+tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
+w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
+2ERqngwPct4mRDp6O58BlZ4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
+MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
+HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
+bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
+C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
+PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
+YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
+JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
+vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
+rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
+MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
+LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
+cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
+QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
+i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
+tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
+w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
+2ERqngwPct4mRDp6O58BlZ4=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Hans-Adolf</GivenName>
+      <SurName>Ruppert</SurName>
+      <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>myLogin</GivenName>
+      <SurName>Team</SurName>
+      <EmailAddress>mylogin@uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.sagepub.com.xml b/swamid-interfederations-2.0/online.sagepub.com.xml
new file mode 100644
index 00000000..3c076511
--- /dev/null
+++ b/swamid-interfederations-2.0/online.sagepub.com.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.sagepub.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">SAGE Journals Online</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">SAGE Journals Online</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://online.sagepub.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no.xml
index 4b18a635..617fc576 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no.xml
@@ -1,21 +1,52 @@
 <?xml version="1.0"?>
-<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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/">
+            <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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="en">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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+    <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/saml" 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"/>
+      <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 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.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.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" 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:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Andreas Åkre</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/payment.statista.com.xml b/swamid-interfederations-2.0/payment.statista.com.xml
new file mode 100644
index 00000000..f496761c
--- /dev/null
+++ b/swamid-interfederations-2.0/payment.statista.com.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://payment.statista.com/simplesaml/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>de.statista.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=de.statista.com,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
+A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
+NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
+MRAwDgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9kZS5zdGF0aXN0YS5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIP8FskLI19g/XBvxY1ua4uEtg
+Q0vdL6f/wuKNP8wc/hCNh/HGJLYj9S0BRFmVlCxiXFhr5GRZAAZN+b6msehsgPs3
+V6yKsP0Ga4yt7ccJuAzUFVU8Qrva2TIvDLPZ7Qucj+2M4ekxpqBjp850JbTqdGO1
+oDmrKAzuxWXUS/9L88tFHiHvaxLEIBK3OYf6k8lK61BZuU2DXIFkd72iCF7LS/sE
+uHh1db+185ssxNiLICu2vqJ9ZpsrYN6qOxSNvxI3jQ7jHNOlVXwFGAeDsnjg4Qxa
+oqfgLekPagmmDWpAI9QHTyqUOAaN03UWigVeb01IiH8EwBKzi82mims7CHb1AgMB
+AAGjggG8MIIBuDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
+BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFOG/Ep6pb7z0/1gHX1D6Yx8DZsGx
+MB8GA1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMIGRBgNVHR8EgYkwgYYw
+QaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUH
+AQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xv
+YmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcw
+AoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCJFZsyyBpVIHAp
+preO/3S9+1Gw4OFWgS4Ajpfxz8H5pV5+6PK9bogtUWt7kSt41rbrWKWWbiZkjuTo
+Th4aHytOOeHpaUYH9qkFa7Cla5L4FEB52uarXlnXtrp3/2sTPvpZWtDk7KNZYvcN
+Psfu+IqZEGwHWuwh58Hl2v5xf137GhgcYuOm5Yabvi0+MdmtHihWuJ2sA7NEWzn8
+LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
+qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
+l/xjGBYl
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Statista</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Statista</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://de.statista.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Leidinger</SurName>
+      <EmailAddress>technik@statista.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Tim</GivenName>
+      <SurName>Kröger</SurName>
+      <EmailAddress>tim.kroeger@statista.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml b/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
new file mode 100644
index 00000000..555dc7a9
--- /dev/null
+++ b/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pqshibboleth.proquest.com:9443/shibboleth">
+    <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://pqshibboleth.proquest.com:9443/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
+aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
+MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
+8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
+WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
+v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
++mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
+6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
+AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
+FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
+dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
+ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
+CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
+8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
+JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
+llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
+w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
+aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
+MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
+8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
+WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
+v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
++mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
+6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
+AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
+FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
+dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
+ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
+CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
+8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
+JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
+llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
+w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">ProQuest</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Host</GivenName>
+      <SurName>Master</SurName>
+      <EmailAddress>hostmaster@csa.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Host</GivenName>
+      <SurName>Master</SurName>
+      <EmailAddress>hostmaster@csa.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Anil</GivenName>
+      <SurName>Nair</SurName>
+      <EmailAddress>anil.nair@proquest.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml b/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
new file mode 100644
index 00000000..1f4c9b4a
--- /dev/null
+++ b/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://proxy.nationallizenzen.de/shibboleth-ezproxy">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
+WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
+aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
+DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
+s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
+jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
+3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
+yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
+jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
+0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
+2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
+EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
+UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
+L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
+qROSGpAVyQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
+PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
+dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
+MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
+WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
+UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
+bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
+aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
+DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
+s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
+jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
+3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
+yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
+utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
+jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
+oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
+0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
+2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
+EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
+UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
+L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
+qROSGpAVyQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Verbundzentrale des Gemeinsamen Bibliotheksverbundes</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Nationallizenzen Privatnutzer Zugangsproxy</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.gbv.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gerald</GivenName>
+      <SurName>Steilen</SurName>
+      <EmailAddress>steilen@gbv.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Till</GivenName>
+      <SurName>Kinstler</SurName>
+      <EmailAddress>kinstler@gbv.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Franck</GivenName>
+      <SurName>Borel</SurName>
+      <EmailAddress>borel@gbv.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.ama-assn.org.xml b/swamid-interfederations-2.0/pubs.ama-assn.org.xml
new file mode 100644
index 00000000..74bc273d
--- /dev/null
+++ b/swamid-interfederations-2.0/pubs.ama-assn.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.ama-assn.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">JAMA</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">JAMA</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://pubs.ama-assn.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/royalsocietypublishing.org.xml b/swamid-interfederations-2.0/royalsocietypublishing.org.xml
new file mode 100644
index 00000000..e762c1ab
--- /dev/null
+++ b/swamid-interfederations-2.0/royalsocietypublishing.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://royalsocietypublishing.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Royal Society Publishing</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Royal Society Publishing</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://royalsocietypublishing.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rt.niif.hu.xml b/swamid-interfederations-2.0/rt.niif.hu.xml
new file mode 100644
index 00000000..74a1cb0e
--- /dev/null
+++ b/swamid-interfederations-2.0/rt.niif.hu.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.niif.hu/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-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:InformationURL xml:lang="en">https://rt.niif.hu/rt</mdui:InformationURL>
+                </mdui:UIInfo>
+            </Extensions>
+            <KeyDescriptor>
+                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                    <ds:KeyName>rt.niif.hu</ds:KeyName>
+                    <ds:X509Data>
+                        <ds:X509Certificate>MIIEJzCCAw+gAwIBAgIJAP2iWF409QGrMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDEXMBUGA1UEChMOTklJRiBJbnN0aXR1dGUxEzARBgNVBAMTCnJ0Lm5paWYuaHUxGjAYBgkqhkiG9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTEwMDYyNTExNTExNVoXDTIwMDYyMjExNTExNVowajELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MRcwFQYDVQQKEw5OSUlGIEluc3RpdHV0ZTETMBEGA1UEAxMKcnQubmlpZi5odTEaMBgGCSqGSIb3DQEJARYLYWFpQG5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDKdKDluI/sl4J57IcX+ZJPkIFfoAQnxS6fR7aQp8Lg5S/fg1ymgD+NZIT+2GHhDz65rEgMfre0yVVvsi3v7FAh973pCxS6iN0MWsWMNUyTD7nKCHkJr/LtDlcvGhdnUN/wo0iX0sIrPEWs31awmSELdi59bbsRKrir85sDXMjInfluJ6O7Gy+xzXv3YB04CYaUcIH5rg+iVBpNsEx9YHD1QyGsenbHaFooAf3UADrg5q+1R0lvGVCnKfnQ+JryxJIy+a+51pa3NDONYzksB89EeAMhLcuHHrI5FovQlCdIZbZepHjP8YeoNAXw4K3WFaZO+RiMmyy1KF96UxC6jpDAgMBAAGjgc8wgcwwHQYDVR0OBBYEFIwTzhmyE9GLngS1l4TiVhV1MFjMMIGcBgNVHSMEgZQwgZGAFIwTzhmyE9GLngS1l4TiVhV1MFjMoW6kbDBqMQswCQYDVQQGEwJIVTERMA8GA1UECBMIQnVkYXBlc3QxFzAVBgNVBAoTDk5JSUYgSW5zdGl0dXRlMRMwEQYDVQQDEwpydC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odYIJAP2iWF409QGrMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG/xND0pKdWrymjqVof1b/05BiSeJEXyPf7E5zank5GY6PouCIvTKPAPXsAD3VISompmp/x5YlZaannaey+WvFEErh0buVbHGVV1g3gLtRpn++J4jR+Vklh0U4wp27AHEwFAG9lkgvKLtzN+b6tt85LW1lwkmkXEjJYOVO5t+etYdvsblMKUEX6CruwDPxgsP1aXqTZdi/Ps0ZglELw0Oqv7KrhTJ7hp4tQFh5cjLunRZRyQQesFG7pDCeQ9XN1w4Jl1tr+zjM9vG0yjD7fPtSHNSH3R46Gk0bHUcQ551JXoIiQV22cgxeCXsOGr4c5elFitmic1+7F6+MiHt7A/YkQ=</ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+            </KeyDescriptor>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.niif.hu/Shibboleth.sso/SLO/SOAP"/>
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+            <AttributeConsumingService index="1" isDefault="true">
+                <ServiceName xml:lang="hu">Request Tracker (GN3-SA2-T4)</ServiceName>
+                <ServiceName xml:lang="en">Request Tracker (GN3-SA4-T4)</ServiceName>
+                <ServiceDescription xml:lang="hu">Request Tracker alkalmazás a Geant3 SA2-T4 taszkhoz </ServiceDescription>
+                <ServiceDescription xml:lang="en">Request tracker instance for Geant3 SA2-T4 task</ServiceDescription>
+                <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+                <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+            </AttributeConsumingService>
+        </SPSSODescriptor>
+        <Organization>
+            <OrganizationName xml:lang="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>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rxauth.reaxys.com.xml b/swamid-interfederations-2.0/rxauth.reaxys.com.xml
new file mode 100644
index 00000000..fedf18c2
--- /dev/null
+++ b/swamid-interfederations-2.0/rxauth.reaxys.com.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rxauth.reaxys.com/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rxauth.reaxys.com/SHIRE/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-rxauth.reaxys.com/SHIRE/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Elsevier</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Elsevier Reaxys</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.reaxys.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml b/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
new file mode 100644
index 00000000..a7a97392
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.dhbw-stuttgart.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
+            <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
+WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
+CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
+EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
+bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
+Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
+JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
+J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
+sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
+RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
+CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
+GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
+7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
+Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
+0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
+BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
+1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
+XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
+cA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.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://saml.dhbw-stuttgart.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dhbw-stuttgart.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">dhbw-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
+            <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
+WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
+CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
+EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
+bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
+YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
+Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
+JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
+J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
+sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
+RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
+CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
+GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
+7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
+Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
+0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
+BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
+1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
+XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
+cA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.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">Duale Hochschule Baden Württemberg Stuttgart</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DHBW Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dhbw-stuttgart.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Bernd</GivenName>
+      <SurName>Ziller</SurName>
+      <EmailAddress>root@dhbw-stuttgart.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Markus</GivenName>
+      <SurName>Bundschuh</SurName>
+      <EmailAddress>bundschuh@dhbw-stuttgart.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml b/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
new file mode 100644
index 00000000..6decaa3f
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.xi.dante.org.uk">
+   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="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>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
+ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
+MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
+c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
+6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
+qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
+A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
+eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
+VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
+yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</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>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
+ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
+MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
+c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
+6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
+qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
+A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
+eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
+VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
+yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</ds:X509Certificate>
+            </ds:X509Data>
+         </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirectResponse"/>
+      <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+   </md:SPSSODescriptor>
+   <md:Organization>
+      <md:OrganizationName xml:lang="en">DANTE</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="en">DANTE</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="en">http://dante.net</md:OrganizationURL>
+   </md:Organization>
+   <md:ContactPerson contactType="technical">
+      <md:Company>DANTE</md:Company>
+      <md:EmailAddress>mandeep@dante.net</md:EmailAddress>
+   </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
new file mode 100644
index 00000000..8ecadad8
--- /dev/null
+++ b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sandbox.aai.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-test</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:InformationURL xml:lang="hu">https://sandbox.aai.niif.hu/</mdui:InformationURL>
+                </mdui:UIInfo>
+            </Extensions>
+            <KeyDescriptor>
+                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                    <ds:KeyName>sandbox.aai.niif.hu</ds:KeyName>
+                    <ds:X509Data>
+                        <ds:X509Certificate>MIIDvjCCAqagAwIBAgIJAKmyDJ5RK7VnMA0GCSqGSIb3DQEBBQUAMEgxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxHDAaBgNVBAMTE3NhbmRib3guYWFpLm5paWYuaHUwHhcNMTAwMTA2MDkzNzM1WhcNMzcwNTI0MDkzNzM1WjBIMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRwwGgYDVQQDExNzYW5kYm94LmFhaS5uaWlmLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAss8blriJkeVc28dczjS3P7u4Hp+mDYqx9MecEzdGqnRPtE+1yJ3M6LkjmcbMSVvF+9i/qxkZxpn0BpIJhD/6WpC7e4TbAIMls6+eBSd82MJE2siANba+g7KIIc73LhEnnMBv5fmbyaAfCGZ6yG45/hsQ7j5f0ufcJuIINfrSIG+Qo3fMggIbgxZot3kzdJFUkPTNY201yQUhNmb2mNSOX1zOQn7+cRbrQ3ZBUj8E7rasqzZc20VhLF/Jv+yNr5zvkoETucJr4G8OyudKCPQT9xegJ9s5GBQ48DEQot6LFJSZ3zwDVeIoedWju2dLe6YIpC9pamhz9y2IP/9VlUhSTwIDAQABo4GqMIGnMB0GA1UdDgQWBBSmKZt1dBQ80ZzNIcEy0Nihu/nZYzB4BgNVHSMEcTBvgBSmKZt1dBQ80ZzNIcEy0Nihu/nZY6FMpEowSDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEcMBoGA1UEAxMTc2FuZGJveC5hYWkubmlpZi5odYIJAKmyDJ5RK7VnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH8CkAleuCDK2S3qHSTdveyeXeIMT0JQ1sMwaNUgDpT7dItMc00Xl7kmcHyLq9ERu066ViSQYbJpFncrC+WrNbu5taArSs8I/iYXdBipRo6QRdy3DmjQEp/UgqKBWt+KZXNYm8UbaXJ0M0HNd9OvMznfDgUiBz0Bjy2e0ILhC15Bv33/zXpFJP+jaNv4C6Ql9Y8DbU/PujNBcBMWfN33gLedFHoHNSKJJcDryIxSDnDy7+TOwWcv3daztZEJ6h3rzGqkaN/+NBUynn1LebvvbWTNGarebjqDcT4D2l4d+QIYvXnECWD3ARf/rdP/KbfoNxD2EBrKdxcvDPq0uQii8nE=</ds:X509Certificate>
+                    </ds:X509Data>
+                </ds:KeyInfo>
+            </KeyDescriptor>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
+            <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sandbox.aai.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://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+            <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
+            <AttributeConsumingService index="1" isDefault="true">
+                <ServiceName xml:lang="hu">sandbox.aai.niif.hu</ServiceName>
+                <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="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" 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="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"/>
+                <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            </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>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="support">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+        <ContactPerson contactType="administrative">
+            <SurName>NIIF AAI</SurName>
+            <EmailAddress>aai@niif.hu</EmailAddress>
+        </ContactPerson>
+    </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scauth.scopus.com.xml b/swamid-interfederations-2.0/scauth.scopus.com.xml
new file mode 100644
index 00000000..18411287
--- /dev/null
+++ b/swamid-interfederations-2.0/scauth.scopus.com.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scauth.scopus.com/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scauth.scopus.com/SHIRE/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-scauth.scopus.com/SHIRE/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Elsevier</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Elsevier Scopus</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
new file mode 100644
index 00000000..fec2b764
--- /dev/null
+++ b/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
+MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
+ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
+NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
+a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
+AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
+OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
+ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
+BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
+RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
+aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
+aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
+WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
+GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
+hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
+mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
+Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
+0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
+TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
+W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Elsevier</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Elsevier ScienceDirect</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Elsevier</GivenName>
+      <SurName>Shibboleth Support</SurName>
+      <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.nature.com.xml b/swamid-interfederations-2.0/secure.nature.com.xml
new file mode 100644
index 00000000..8439a5a2
--- /dev/null
+++ b/swamid-interfederations-2.0/secure.nature.com.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.nature.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>secure.nature.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=secure.nature.com,OU=NPG,O=Macmillan,L=London,C=UK</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDNDCCAhygAwIBAgIESpaZbzANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
+SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
+A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMDkwODI3MTQzNDIz
+WhcNMTIwODI2MTQzNDIzWjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
+MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
+dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv
+3qPD8StbD+IIgRZC0HxMghUOP5B+Q4CfDg7pIkxrLU2SUfb8aepSl5p3e//sRctS
++niHwVMi2We7NkXJLZ+BgcMf7+YxDWFv7tZzG63geyK404uxzuKmlHmmeEzaFW99
+2tNI6f9O/cvL9LIJOv5LjsfOIwBvrjY2+iECsuRNXLpgnuvrU78/D82OjR1XK7IM
+0npoZSYRiidMe/QNRBdHfY/8h8V4Wu2eozKUITZO5ggGjizkR7+eSI+1PIOydnAm
+0kKylBYhwmm+sh1SkMpcmCScWaVJmlcdw9YpGYjDcJk60r+CZIQd4TY9cWSI2J1H
+CIgsO27TSpG/Opw5+RMZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAI8tPWDsEX3M
+CUO/aEdnb6nqnRzPmbtUHvxVFhcvNk/1M819Gt2oG5rTc2v86S/wbcrnCoYmwyHV
+W50vrRqEmEeEgZ2K7dRgrrdIfzfkInbf9Cjf/c3gX1IRNYqo3/Sw2+ShsV4tdzFA
+Y4ngrDm2pMYm0TKGXLE1jrh24BhEjCfso/yh6NT7JEA6YXdazEW3MlCHkGVhtE1Y
+SDT+VtaMa4rqCjCOEQknU/vN60oBhyoKbZPAUfknfRf5XBkPE5Vy4QsRZ/D15tx0
+yTmkAyxSSBlN79xSJ2IciALnoXg+CLFvDYrCeDKi0qs165v/NzGt59r+VNc1yefX
+UcROare0YUA=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/Shibboleth.sso/SAML/POST" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/Shibboleth.sso/SAML/Artifact" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Nature Publishing Group</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Nature Publishing Group</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Amanda</GivenName>
+      <SurName>Ward</SurName>
+      <EmailAddress>a.ward@nature.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>John</GivenName>
+      <SurName>Ollier</SurName>
+      <EmailAddress>jollier@nature.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.aai.mpg.de.xml b/swamid-interfederations-2.0/services.aai.mpg.de.xml
new file mode 100644
index 00000000..b17c8ad1
--- /dev/null
+++ b/swamid-interfederations-2.0/services.aai.mpg.de.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.aai.mpg.de/idp/proxy/idp">
+    <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>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>services.aai.mpg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
+MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
+aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
+lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
+T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
+kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
+fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
+5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
+zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
+Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
+Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
+d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
+gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
+om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
+HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
+ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
+DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
+guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>services.aai.mpg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
+MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
+aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
+lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
+T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
+kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
+fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
+5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
+zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
+Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
+Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
+d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
+gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
+om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
+HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
+ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
+DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
+guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/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://services.aai.mpg.de/idp/proxy/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/Redirect/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST-SimpleSign/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 use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>services.aai.mpg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
+MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
+aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
+lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
+T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
+kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
+fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
+5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
+zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
+Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
+Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
+d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
+gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
+om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
+HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
+ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
+DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
+guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>services.aai.mpg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
+MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
+aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
+lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
+T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
+kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
+fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
+5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
+2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
+zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
+Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
+Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
+d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
+gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
+BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
+om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
+HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
+ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
+DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
+guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/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">Max-Planck-Gesellschaft</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.mpg.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Sebastian</GivenName>
+      <SurName>Rieger</SurName>
+      <EmailAddress>sebastian.rieger@gwdg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Matthias</GivenName>
+      <SurName>Egger</SurName>
+      <EmailAddress>matthias.egger@rzg.mpg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Thorsten</GivenName>
+      <SurName>Hindermann</SurName>
+      <EmailAddress>thorsten.hindermann@gwdg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.oxfordjournals.org.xml b/swamid-interfederations-2.0/services.oxfordjournals.org.xml
new file mode 100644
index 00000000..8b2dd2d8
--- /dev/null
+++ b/swamid-interfederations-2.0/services.oxfordjournals.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.oxfordjournals.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Oxford Journals</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Oxford Journals</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.oxfordjournals.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml b/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
new file mode 100644
index 00000000..48e74ee7
--- /dev/null
+++ b/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shi-idp2.rz.fh-muenchen.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hm.edu</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
+E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
+ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
+NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
+ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
+Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
+N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
+C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
+hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
+GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
+WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
+ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
+A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
+OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
+L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
+Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
+KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
+QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
+TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
+dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
+jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
+ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.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://shi-idp2.rz.fh-muenchen.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.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">hm.edu</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
+E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
+ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
+NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
+ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
+Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
+N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
+C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
+hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
+GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
+WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
+ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
+A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
+OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
+L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
+Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
+KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
+Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
+QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
+TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
+dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
+jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
+ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.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">Hochschule München IdP 2.5</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule München IdP</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hm.edu</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Harald</GivenName>
+      <SurName>Strack</SurName>
+      <EmailAddress>dfn-aai@hm.edu</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Andreas</GivenName>
+      <SurName>Boeck</SurName>
+      <EmailAddress>dfn-aai@hm.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.awi.de.xml b/swamid-interfederations-2.0/shib-idp.awi.de.xml
new file mode 100644
index 00000000..f270141d
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.awi.de.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.awi.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">awi.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.awi.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
+ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
+a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
+A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
+VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
+Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
+1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
+r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
+HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
+ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
+UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
+HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
+Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
+L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
+42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
+wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
+jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
+UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
+R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.awi.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
+ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
+a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
+A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
+VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
+Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
+1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
+r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
+HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
+ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
+UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
+HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
+Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
+L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
+42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
+wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
+jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
+UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
+R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.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://shib-idp.awi.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.awi.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">awi.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.awi.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
+ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
+a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
+A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
+VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
+Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
+1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
+r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
+HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
+ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
+UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
+HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
+Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
+L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
+42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
+wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
+jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
+UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
+R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.awi.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
+ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
+a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
+A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
+VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
+Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
+1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
+r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
+HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
+ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
+UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
+HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
+Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
+L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
+L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
+L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
+42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
+wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
+jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
+UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
+R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.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">Stiftung Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.awi.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Joerg</GivenName>
+      <SurName>Matthes</SurName>
+      <EmailAddress>joerg.matthes@awi.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Stefan</GivenName>
+      <SurName>Pinkernell</SurName>
+      <EmailAddress>stefan.pinkernell@awi.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
new file mode 100644
index 00000000..bc0f99e3
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/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>
+        <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>
+      <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">Humboldt-Universität zu Berlin</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hu-berlin.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Petra</GivenName>
+      <SurName>Berg</SurName>
+      <EmailAddress>shibadmin@hu-berlin.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Petra</GivenName>
+      <SurName>Berg</SurName>
+      <EmailAddress>shibadmin@hu-berlin.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml b/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
new file mode 100644
index 00000000..c998c524
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-hildesheim.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hildesheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
+SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
+MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
+ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
+c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
+BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
+V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
+BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
+uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
+4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
+DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
+BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
+BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
+9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
+y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
+bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
+P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
+MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.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://shib-idp.uni-hildesheim.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-hildesheim.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-hildesheim.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
+SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
+MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
+ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
+c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
+BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
+V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
+BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
+uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
+4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
+DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
+BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
+BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
+9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
+y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
+bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
+P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
+MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.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">Universität Hildesheim</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Hildesheim</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-hildesheim.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tobias</GivenName>
+      <SurName>Werner</SurName>
+      <EmailAddress>wernert@uni-hildesheim.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
new file mode 100644
index 00000000..0c98ec35
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-osnabrueck.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
+MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
+MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
+DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
+aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
+IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
+fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
+pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
+NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
+9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
+m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
+FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
+VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
+aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
+dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
+cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
+ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
+y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
++B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
+a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
+u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
+N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
+nT7WnMt5n4CA
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.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://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.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-osnabrueck.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
+REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
+ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
+MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
+MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
+DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
+aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
+IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
+fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
+pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
+NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
+9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
+m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
+FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
+VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
+aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
+dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
+cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
+BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
+ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
+BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
+BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
+y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
++B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
+a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
+u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
+N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
+nT7WnMt5n4CA
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.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">Universitaet Osnabrueck</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Osnabrück</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Werner</GivenName>
+      <SurName>Nienhüser</SurName>
+      <EmailAddress>Werner.Nienhueser@Uni-Osnabrueck.DE</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
new file mode 100644
index 00000000..331773db
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.alexanderstreet.com/shibboleth-sp">
+    <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://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
+UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
+BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
+ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
+CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
+ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
+c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
+oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
+3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
+3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
+weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
+baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
+XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
+9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
+k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
+68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
+IeRCblzZC+JMvA/j4d6Mi/s8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
+UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
+BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
+ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
+CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
+ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
+c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
+oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
+3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
+3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
+weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
+baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
+XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
+9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
+k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
+68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
+IeRCblzZC+JMvA/j4d6Mi/s8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Alexander Street Press LLC.</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Alexander Street Press LLC</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://alexanderstreet.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Nathanel</GivenName>
+      <SurName>Sulimanov</SurName>
+      <EmailAddress>nathanels@astreetpress.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>John</GivenName>
+      <SurName>Field</SurName>
+      <EmailAddress>jfield@astreetpress.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml b/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
new file mode 100644
index 00000000..3e774a92
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ph-heidelberg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-heidelberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
+cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
+BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
+MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
+bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
+ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
+LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
+tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
+Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
+2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
+oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
+lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
+roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
+VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
+O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
+aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
+MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
+cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
+9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
+PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
+IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
+7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
+/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.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://shib.ph-heidelberg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ph-heidelberg.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">ph-heidelberg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
+REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
+YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
+cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
+BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
+MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
+bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
+ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
+LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
+tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
+Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
+2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
+oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
+lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
+roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
+VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
+O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
+aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
+MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
+cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
+9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
+PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
+IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
+7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
+/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.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">PH-Heidelberg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Pädagogische Hochschule Heidelberg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ph-heidelberg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Dieter</GivenName>
+      <SurName>Schlaier</SurName>
+      <EmailAddress>schlaier@ph-heidelberg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Peter</GivenName>
+      <SurName>Moos</SurName>
+      <EmailAddress>moos@ph-heidelberg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de.xml b/swamid-interfederations-2.0/shib.uni-mainz.de.xml
new file mode 100644
index 00000000..36fd1cbd
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.uni-mainz.de.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni-mainz.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
+            <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
+MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
+bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
+IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
+Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
+TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
+A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
+aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
+YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
+9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
+O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
+TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
+TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
+nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
+Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
+2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
+ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
+AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
+bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
+ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
+dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
+b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
+Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
+LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
+Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
+AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
+ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
+BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
+l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
+SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
+Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
+YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
+qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.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://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
+            <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
+MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
+bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
+IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
+Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
+TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
+A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
+aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
+YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
+9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
+O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
+TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
+TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
+nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
+Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
+2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
+ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
+AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
+bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
+ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
+dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
+b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
+Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
+LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
+Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
+AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
+ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
+BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
+l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
+SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
+Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
+YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
+qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Johannes Gutenberg Universität Mainz</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Mainz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-mainz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Glatzer</SurName>
+      <EmailAddress>glatzert@uni-mainz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml b/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
new file mode 100644
index 00000000..c03e36ab
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.urz.uni-halle.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-halle.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
+A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
+HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
+WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
+ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
+ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
+cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
+LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
+xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
+nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
+GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
+Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
+UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
+HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
+MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
+ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
+iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
+w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
+N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
+6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
+F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
+A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
+HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
+WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
+ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
+ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
+cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
+LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
+xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
+nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
+GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
+Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
+UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
+HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
+MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
+ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
+iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
+w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
+N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
+6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
+F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.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://shib.urz.uni-halle.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.urz.uni-halle.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-halle.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
+A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
+HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
+WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
+ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
+ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
+cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
+LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
+xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
+nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
+GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
+Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
+UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
+HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
+MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
+ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
+iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
+w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
+N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
+6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
+F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
+REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
+A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
+ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
+HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
+WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
+ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
+ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
+cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
+LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
+xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
+nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
+GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
+Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
+UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
+HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
+YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
+MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
+ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
+iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
+w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
+N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
+6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
+F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.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">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://bibliothek.uni-halle.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Michael</GivenName>
+      <SurName>Schaarschmidt</SurName>
+      <EmailAddress>michael.schaarschmidt@urz.uni-halle.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Armin</GivenName>
+      <SurName>Angelus</SurName>
+      <EmailAddress>armin.angelus@bibliothek.uni-halle.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml b/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
new file mode 100644
index 00000000..67a82245
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-idp.hs-weingarten.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-weingarten.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
+BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
+cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
+gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
+BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
+Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
+iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
+p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
+5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
+lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
+Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
+2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
+8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
+GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
+Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
+CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
+I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
+GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
+IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
+H3lgjwLUApbZq/qieYKqmBs=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
+BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
+cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
+gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
+BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
+Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
+iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
+p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
+5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
+lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
+Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
+2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
+8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
+GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
+Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
+CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
+I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
+GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
+IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
+H3lgjwLUApbZq/qieYKqmBs=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.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://shibb-idp.hs-weingarten.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.hs-weingarten.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">hs-weingarten.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
+BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
+cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
+gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
+BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
+Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
+iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
+p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
+5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
+lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
+Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
+2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
+8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
+GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
+Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
+CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
+I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
+GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
+IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
+H3lgjwLUApbZq/qieYKqmBs=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
+BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
+cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
+gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
+BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
+Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
+iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
+p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
+5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
+lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
+Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
+2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
+8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
+GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
+cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
+Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
+CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
+I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
+GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
+IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
+H3lgjwLUApbZq/qieYKqmBs=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.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">Hochschule Ravensburg-Weingarten</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Ravensburg-Weingarten</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-weingarten.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Michaiela</GivenName>
+      <SurName>Erdoes</SurName>
+      <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Michaiela</GivenName>
+      <SurName>Erdoes</SurName>
+      <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.zalf.de.xml b/swamid-interfederations-2.0/shibb.zalf.de.xml
new file mode 100644
index 00000000..f42a149b
--- /dev/null
+++ b/swamid-interfederations-2.0/shibb.zalf.de.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.zalf.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">zalf.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb.zalf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
+MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
+cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
+9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
+NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
+BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
+cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
+aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
+y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
+ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
+GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
+KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
+pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
+TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
+Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
+ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
+Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
+Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
+FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
+y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
+hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb.zalf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
+MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
+cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
+9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
+NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
+BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
+cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
+aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
+y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
+ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
+GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
+KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
+pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
+TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
+Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
+ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
+Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
+Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
+FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
+y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
+hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.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://shibb.zalf.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.zalf.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.zalf.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">zalf.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb.zalf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
+MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
+cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
+9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
+NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
+BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
+cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
+aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
+y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
+ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
+GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
+KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
+pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
+TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
+Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
+ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
+Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
+Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
+FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
+y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
+hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibb.zalf.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
+REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
+MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
+cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
+9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
+NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
+BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
+cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
+aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
+y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
+ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
+GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
+KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
+pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
+TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
+Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
+ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
+Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
+QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
+Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
+Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
+FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
+y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
+hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.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">Leibniz-Zentrum für Agrarlandschaftsforschung (ZALF) e. V. Müncheberg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ZALF Müncheberg IdP</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.zalf.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gunar</GivenName>
+      <SurName>Maiwald</SurName>
+      <EmailAddress>maiwald@zib.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Gunar</GivenName>
+      <SurName>Maiwald</SurName>
+      <EmailAddress>maiwald@zib.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
new file mode 100644
index 00000000..2d6c6392
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-wuerzburg.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuerzburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
+IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
+BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
+LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
+jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
+4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
+0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
+FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
+MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
+NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
+BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
+qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
+VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
+2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
+Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
+O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
+fiTDOOsi
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
+IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
+BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
+LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
+jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
+4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
+0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
+FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
+MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
+NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
+BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
+qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
+VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
+2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
+Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
+O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
+fiTDOOsi
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.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:persistent</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-idp.uni-wuerzburg.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-wuerzburg.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-wuerzburg.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
+IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
+BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
+LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
+jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
+4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
+0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
+FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
+MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
+NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
+BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
+qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
+VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
+2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
+Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
+O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
+fiTDOOsi
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
+ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
+IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
+BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
+LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
+jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
+4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
+0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
+FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
+FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
+MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
+NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
+Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
+ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
+BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
+qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
+VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
+2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
+Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
+O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
+fiTDOOsi
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Würzburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Rossa</SurName>
+      <EmailAddress>rossa@rz.uni-wuerzburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Maria</GivenName>
+      <SurName>Warren</SurName>
+      <EmailAddress>warren@rz.uni-wuerzburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
new file mode 100644
index 00000000..c50d2505
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.amdigital.co.uk/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.amdigital.co.uk</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.amdigital.co.uk</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
+DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
+Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
+CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
+gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
+bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
+IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
+Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
+BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
+LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
+AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
+i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
+pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
+9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
+iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
+lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Adam Matthew Digital</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Adam Matthew Digital</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.amdigital.co.uk/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Dave</GivenName>
+      <SurName>Mills</SurName>
+      <EmailAddress>dave.mills@trueclarity.co.uk</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Rhys</GivenName>
+      <SurName>Godfrey</SurName>
+      <EmailAddress>rhys.godfrey@trueclarity.co.uk</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
index 31e1b284..57cd851a 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
@@ -1,10 +1,15 @@
 <?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="https://shibboleth.bbaw.de/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
+    <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://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
 REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
 ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
 aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
@@ -31,37 +36,76 @@ T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
 7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
 znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
 9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
-eQj7ACg8</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kai</md:GivenName>
-    <md:SurName>Zimmer</md:SurName>
-    <md:EmailAddress>zimmer@bbaw.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+eQj7ACg8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
+REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
+ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
+aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
+ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
+MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
+V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
++6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
+29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
+GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
+oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
+gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
+AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
+HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
+MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
+a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
+T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
+7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
+znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
+9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
+eQj7ACg8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.bbaw.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Kai</GivenName>
+      <SurName>Zimmer</SurName>
+      <EmailAddress>zimmer@bbaw.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Dr. Wolf-Hagen</GivenName>
+      <SurName>Krauth</SurName>
+      <EmailAddress>krauth@bbaw.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cancom.de.xml b/swamid-interfederations-2.0/shibboleth.cancom.de.xml
new file mode 100644
index 00000000..90be63fe
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.cancom.de.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cancom.de/shibboleth">
+    <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://shibboleth.cancom.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.cancom.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.cancom.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT43331679,O=shibboleth.cancom.de,C=DE,serialNumber=F4dXwt5ugAu7e7Ltux5s8bM/j7lNMezn</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE3DCCA8SgAwIBAgICSoEwDQYJKoZIhvcNAQEFBQAwPDELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDkdlb1RydXN0LCBJbmMuMRQwEgYDVQQDEwtSYXBpZFNTTCBDQTAe
+Fw0xMTAxMDkxNDQ0NDhaFw0xMzAxMTEyMzI1MDZaMIHvMSkwJwYDVQQFEyBGNGRY
+d3Q1dWdBdTdlN0x0dXg1czhiTS9qN2xOTWV6bjELMAkGA1UEBhMCREUxHTAbBgNV
+BAoTFHNoaWJib2xldGguY2FuY29tLmRlMRMwEQYDVQQLEwpHVDQzMzMxNjc5MTEw
+LwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChjKTEx
+MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNTTChS
+KTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jYW5jb20uZGUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDVmUFYIEL9UJy4KuViBxD0czaGIe0/NPBHBslPike2
+kEnkayjIDKq9VKM2qmTVWud2Zz7lDicCbZe7CQ8bcPYSV0I8temTV2qZRXKIfYa7
+JXSdwLPlN8hgBRAXlrKnlvyeVLfohPq5/dW5sXmK5DJsAU5vIG7y2uT24MRJfN3U
+39iP2B2zy7uo/q5aCutrIphnhHGjFv3ZiIS4UNHUA+rj4mjPVWxc7p7wko0XteQg
+9qmH/Ec+hIBdRWNaMwgjkvlsrHwaMpXm0d4WZZ9Alo0OeEN9LgGGSZzkrLJlEXgz
+CGOVxgWuZV/w1CD7QkxB0Mb2yFzdyYP1slEGDLbJhvopAgMBAAGjggEyMIIBLjAf
+BgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMCBaAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdEQQYMBaCFHNoaWJi
+b2xldGguY2FuY29tLmRlMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNz
+bC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBQq
+xzB+sSIJfDxj6RHC/lXqvkg/fDAMBgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0w
+OzA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20v
+cmFwaWRzc2wuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAGgTC+pETyFmjT3Kt/wx7q
+QGUGWbqaWCmzYgStsEnDxWyZbUc6rMq7W6TVFSkahKYtBMTo3FWRRwp2htzOGeET
+1oUft7RiLAA3wVoT9u+rqICDerohrptv1eL9hcgzfxb61b71KfRqmWjgFHijQSY8
+1NAzSDDSCHpGtc3ezlDSKDOkNEob6gyKqCIcl07/FSvJ5RdYg//Eot6KgHHL/bNZ
+eJur9jqTlpTnC3jbRKS5CFQyW1A7nuO5qS7754LYipej85P3/KBgK8/YkOotHxyY
+vWiel2Ikzc/M5wNfxh5dHOxvy/vi09ktSrrgoS10Z/x8Q+ulyBYGJpcmPO0FkSHZ
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Cancom Deutschland GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Cancom Deutschland GmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.cancom.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Florian</GivenName>
+      <SurName>Schneider</SurName>
+      <EmailAddress>florian.schneider@cancom.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Felicia</GivenName>
+      <SurName>Henkel</SurName>
+      <EmailAddress>felicia.henkel@cancom.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml b/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
new file mode 100644
index 00000000..f0588b58
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.chadwyck.co.uk/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
+A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
+BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
+Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
+aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
+34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
+4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
+6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
+xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
+Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
+MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
+bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
+AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
+dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
+BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
+KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
+hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
+aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
+4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
+5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
+YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
+A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
+b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
+BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
+Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
+aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
+34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
+4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
+6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
+xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
+Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
+MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
+bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
+AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
+dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
+BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
+KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
+hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
+aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
+4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
+5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
+YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.chadwyck.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">ProQuest (Chadwyck-Healey products)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ProQuest-Chadwyck-Healey</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.proquest.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Geoff</GivenName>
+      <SurName>Leach</SurName>
+      <EmailAddress>Geoff.Leach@proquest.co.uk</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml b/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
new file mode 100644
index 00000000..bb14fb64
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.dhbw-karlsruhe.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
+dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
+bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
+qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
+mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
+/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
+y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
++l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
+Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
+vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
+dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
+hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
+G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
+8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
+GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
+MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
+AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.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://shibboleth.dhbw-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dhbw-karlsruhe.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">dhbw-karlsruhe.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
+RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
+FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
+LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
+BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
+ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
+dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
+bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
+qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
+mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
+/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
+y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
++l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
+Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
+vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
+dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
+hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
+LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
+G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
+8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
+GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
+MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
+AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.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">DHBW Karlsruhe</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DHBW Karlsruhe</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dhbw-karlsruhe.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Johannes</GivenName>
+      <SurName>Mickel</SurName>
+      <EmailAddress>mickel@dhbw-karlsruhe.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
new file mode 100644
index 00000000..5dde0409
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
+    <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://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=shibboleth1.epnet.com,O=EBSCO Industries\, Inc.,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
+vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
+FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
+FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
+cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
+n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
+TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
+KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
+A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
+KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
+KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
+KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
+b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
+ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
+Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
+ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
+accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
+Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
+FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
+fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
+WFUQmFDppVjUgYkCed/yDImwZoE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=shibboleth1.epnet.com,O=EBSCO Industries\, Inc.,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
+vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
+FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
+FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
+cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
+n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
+TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
+KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
+A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
+KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
+KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
+KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
+b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
+ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
+Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
+ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
+accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
+Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
+FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
+fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
+WFUQmFDppVjUgYkCed/yDImwZoE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="5"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">EBSCO Publishing</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">EBSCO Information Services/EBSCO Publishing</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ebscohost.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>EBSCO</GivenName>
+      <SurName>Shiboleth Admin</SurName>
+      <EmailAddress>shib-admin@ebscohost.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>EBSCO</GivenName>
+      <SurName>Shibboleth Tech</SurName>
+      <EmailAddress>shib-tech@ebscohost.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml b/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
new file mode 100644
index 00000000..442d1973
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fiz-technik.de/tecfinder">
+    <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://shibboleth.fiz-technik.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
+xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
+d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
+ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
+ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
+cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
+BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
+YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
+Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
+bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
+eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
+LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
+KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
+gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
+u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
+3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
+xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
+d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
+ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
+ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
+cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
+BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
+YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
+DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
+Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
+bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
+eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
+LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
+KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
+gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
+u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
+3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">WTI-Frankfurt eG</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">WTI-Frankfurt</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.wti-frankfurt.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Christian</GivenName>
+      <SurName>Seger</SurName>
+      <EmailAddress>christian.seger@wti-frankfurt.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.genios.de.xml b/swamid-interfederations-2.0/shibboleth.genios.de.xml
new file mode 100644
index 00000000..767ce7d8
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.genios.de.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.genios.de/shibboleth">
+    <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://shibboleth.genios.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.genios.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
+MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
+LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
+Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
+paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
+3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
+HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
+AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
+2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
+bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
+YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
+cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
+BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
+QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
+dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
+taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
+HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
+bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.genios.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
+MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
+LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
+Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
+paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
+3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
+HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
+AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
+2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
+bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
+YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
+cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
+BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
+ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
+QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
+dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
+taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
+HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
+bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.genios.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Michael</GivenName>
+      <SurName>Klenk</SurName>
+      <EmailAddress>michael.klenk@genios.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org.xml b/swamid-interfederations-2.0/shibboleth.highwire.org.xml
new file mode 100644
index 00000000..a351a16d
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.highwire.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/annintmed">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/annintmed/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/annintmed/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/annintmed/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/annintmed/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Annals of Internal Medicine</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Annals of Internal Medicine</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.annals.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml b/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
new file mode 100644
index 00000000..34150518
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.illumina.csa.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
+Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
+MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
+9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
+c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
+kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
+QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
+P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
+AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
+RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
+bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
+6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
+xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
+46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
++bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
+4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
+Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
+MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
+9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
+c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
+kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
+QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
+P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
+AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
+RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
+bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
+6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
+xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
+46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
++bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
+4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/Artifact" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/POST" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">ProQuest</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ProQuest-CSA</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Host</GivenName>
+      <SurName>Master</SurName>
+      <EmailAddress>hostmaster@csa.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Host</GivenName>
+      <SurName>Master</SurName>
+      <EmailAddress>hostmaster@csa.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.metapress.com.xml b/swamid-interfederations-2.0/shibboleth.metapress.com.xml
new file mode 100644
index 00000000..38ae2c51
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.metapress.com.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.metapress.com/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.metapress.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
+MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
+ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
+bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
+FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
+U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
+vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
+SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
+dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
+WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
+Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
+hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
+b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
+BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
+0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
+cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
+9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
+bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
+1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
+IBA=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.metapress.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
+MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
+ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
+bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
+FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
+U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
+vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
+SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
+dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
+WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
+Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
+hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
+b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
+BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
+0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
+cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
+9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
+bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
+1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
+IBA=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Metapress</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">MetaPress</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.metapress.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Tiffany</GivenName>
+      <SurName>Rich</SurName>
+      <EmailAddress>tiffanyrich@metapress.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Casey</GivenName>
+      <SurName>Patterson</SurName>
+      <EmailAddress>metapress@openidp.org</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com.xml b/swamid-interfederations-2.0/shibboleth.ovid.com.xml
new file mode 100644
index 00000000..7b9ba1de
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.ovid.com.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ovid.com/entity">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.ovid.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.ovid.com,O=Ovid Technologies\, Inc.,L=Sandy,ST=Utah,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQRcoWrU6+ffPVrfItakXStDANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzI4
+MDAwMDAwWhcNMTIwMzI3MjM1OTU5WjBsMQswCQYDVQQGEwJVUzENMAsGA1UECBME
+VXRhaDEOMAwGA1UEBxQFU2FuZHkxIDAeBgNVBAoUF092aWQgVGVjaG5vbG9naWVz
+LCBJbmMuMRwwGgYDVQQDFBNzaGliYm9sZXRoLm92aWQuY29tMIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQCw1X91LxDWuHGrQUsXVLEVPy1TWAeCq+o9O8b/B7Ak
+xlqPlSpbduanoo5quky+5PhVDcePXzbkzIX6gXV0yKQdkxOqoSTelXQr/kgacWVm
+TouCY1Gq/YyGk4PlMw9CKW4har9gcdN4hX20Ml0CNBqAbKD7laW9/KClj0Nf7rhK
+jwIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0fBD4w
+PDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNpZ24uY29tL1NW
+UlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
+BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYwFAYI
+KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPY
+vnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVy
+aXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52
+ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFww
+WjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweL
+IQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkq
+hkiG9w0BAQUFAAOCAQEAnH4QwA1KVFARs7qXwzBUgGs6nZSkuZ5BMmnrpIbjJah3
+U7cEsb30/nhDckRVdHOx/+FWuYs5l4gPZ5VGlNz25yv4Tsy5jxcNZGHHDzGZWAcc
+GQZ+CSGYb5Bi2UUI4pLAK0qo7cDc/WHyYG/hMEUiZs5VbeplJupEXvDnP0GoJRfl
+npDYxsgoGjX6vUYqJCoccRRVot0tJCAm2vLBYk5Vb15XPd8cotb7OceW/wznj79o
+7kQji0SE5U8eJTJvMLcuRqpC2yYLlrVyZHxk6v2xgFs5AsjXR/zBv8+hVukrhIb3
+MLXlHVJRLoeP410NcHfsm1LrhOHl/GJmuXWm+DUIBg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/Artifact" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML2/POST" index="7"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Ovid Technologies - A Wolters Kluwer Business</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Ovid</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ovid.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Mark</GivenName>
+      <SurName>Rodrigues</SurName>
+      <EmailAddress>mark.rodrigues@wolterskluwer.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>John</GivenName>
+      <SurName>Marquiss</SurName>
+      <EmailAddress>john.marquiss@wolterskluwer.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Global Online</GivenName>
+      <SurName>Operations</SurName>
+      <EmailAddress>goosandy@ovid.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml b/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
new file mode 100644
index 00000000..9ff9d707
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-trier.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
+bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
+MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
+ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
+cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
+5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
+Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
+6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
+/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
+SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
+AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
+Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
+emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
+ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
+MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
+BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
+/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
+wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
+Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
+18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
+9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.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://shibboleth.uni-trier.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.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-trier.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
+bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
+MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
+ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
+cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
+5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
+Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
+6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
+/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
+SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
+AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
+Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
+emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
+ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
+MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
+BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
+X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
+/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
+wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
+Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
+18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
+9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.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">Universität Trier</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Trier</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-trier.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Uwe</GivenName>
+      <SurName>Ziegler</SurName>
+      <EmailAddress>ziegler@uni-trier.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml b/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
new file mode 100644
index 00000000..35155bb4
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth1.rz.hft-stuttgart.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hft-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
+REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
+MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
+QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
+MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
+BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
+c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
+V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
+/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
+YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
+n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
+zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
+cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
+BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
+mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
+gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
+56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
+HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
+1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.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://shibboleth1.rz.hft-stuttgart.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth1.rz.hft-stuttgart.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">hft-stuttgart.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
+REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
+MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
+QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
+MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
+BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
+c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
+V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
+/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
+YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
+n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
+zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
+cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
+Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
+BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
+CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
+mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
+gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
+56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
+HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
+1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.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">HFT-Stuttgart</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule für Technik Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hft-stuttgart.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Hans-Peter</GivenName>
+      <SurName>Heppel</SurName>
+      <EmailAddress>hans-peter.heppel@hft-stuttgart.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
new file mode 100644
index 00000000..fe5f3456
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brillonline.nl/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
+SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
+GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
+jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
+M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
+DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
+eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
+kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
+R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
+XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
+MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
+EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
+YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
+XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
+E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
+OsSkSoP6HZrPCOXMEAK23C8pxQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
+MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
+ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
+SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
+c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
+GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
+jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
+M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
+DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
+eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
+kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
+R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
+XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
+MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
+EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
+YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
+XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
+E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
+OsSkSoP6HZrPCOXMEAK23C8pxQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Brill Shibboleth 2 SP</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Brill Shibboleth 2 SP</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.brill.nl/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Help</GivenName>
+      <SurName>desk</SurName>
+      <EmailAddress>brill-shibboleth-support@semantico.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Colin</GivenName>
+      <SurName>Caveney</SurName>
+      <EmailAddress>colin.caveney@semantico.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slcs.pca.dfn.de.xml b/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
new file mode 100644
index 00000000..fdcffd0d
--- /dev/null
+++ b/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slcs.pca.dfn.de/shibboleth">
+    <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://slcs.pca.dfn.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
+MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
+hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
+YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
+R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
+KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
+gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
+ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
+A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
+c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
+Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
+IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
+VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
+GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
+/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
+73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
+MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
+hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
+YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
+R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
+KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
+gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
+ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
+BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
+A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
+c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
+MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
+Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
+BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
+dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
+YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
+IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
+VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
+GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
+/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
+73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">DFN-CERT Services GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DFN Short-Lived Credential Service (DFN-SLCS)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Reimer</GivenName>
+      <SurName>Karlsen-Masur</SurName>
+      <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Reimer</GivenName>
+      <SurName>Karlsen-Masur</SurName>
+      <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.asknet.de.xml b/swamid-interfederations-2.0/sp.asknet.de.xml
new file mode 100644
index 00000000..73d4a9c4
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.asknet.de.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.asknet.de/shibboleth-sp">
+    <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.asknet.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.asknet.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
+MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
+LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
+qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
+7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
+InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
+HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
+MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
+IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
+YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
+hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
+SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
+yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
+wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
+fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
+RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
+rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.asknet.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
+MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
+LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
+qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
+7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
+InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
+HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
+MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
+IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
+YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
+hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
+ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
+SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
+yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
+wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
+fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
+RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
+rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">asknet AG Karlsruhe</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">asknet AG Serviceprovider</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.asknet.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Frank</GivenName>
+      <SurName>Flottemesch</SurName>
+      <EmailAddress>frank.flottemesch@asknet.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Jörgen</GivenName>
+      <SurName>Dahlke</SurName>
+      <EmailAddress>joergen.dahlke@asknet.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
new file mode 100644
index 00000000..427f80a6
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
+    <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"/>
+      </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
+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>
+      <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"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">CLARIN</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">CLARIN</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.clarin.eu</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Daan</GivenName>
+      <SurName>Broeder</SurName>
+      <EmailAddress>Daan.Broeder@mpi.nl</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Tobias</GivenName>
+      <SurName>van Valkenhoef</SurName>
+      <EmailAddress>tobias.vanvalkenhoef@mpi.nl</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.eblib.com.xml b/swamid-interfederations-2.0/sp.eblib.com.xml
new file mode 100644
index 00000000..55c48e8f
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.eblib.com.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.eblib.com/shibboleth">
+    <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.eblib.com/Shibboleth.sso/DS" 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.eblib.com/Shibboleth.sso/ACODS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ebooks.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
+DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
+Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
+VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
+ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
+CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
+VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
+aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
+LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
+YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
+ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
+HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
+BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
+dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
+q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
+h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
+YzM6IclOG3yKzoY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ebooks.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
+DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
+Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
+VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
+ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
+CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
+VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
+aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
+LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
+YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
+ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
+HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
+BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
+dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
+q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
+h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
+YzM6IclOG3yKzoY=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Ebook Library</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">EBL</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.eblib.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Vinay</GivenName>
+      <SurName>Bharadwaj</SurName>
+      <EmailAddress>v@ebooks.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml b/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
new file mode 100644
index 00000000..05191e86
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.elearning.uni-bremen.de/module.php/saml/sp/metadata.php/default-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
+aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
+Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
+bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
+ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
+bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
+mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
+uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
+g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
+5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
+clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
+IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
+kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
+VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
+BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
+cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
+mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
+0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
+LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
+ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
+n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
+RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
+aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
+Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
+bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
+ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
+bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
+mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
+uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
+g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
+5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
+clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
+IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
+kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
+VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
+LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
+BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
+cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
+mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
+0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
+LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
+ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
+n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-logout.php/default-sp"/>
+      <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://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://elearning.uni-bremen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Oliver</GivenName>
+      <SurName>Oster</SurName>
+      <EmailAddress>olio@zmml.uni-bremen.de</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 d1ba3828..cb790898 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,10 +1,15 @@
 <?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="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>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
+    <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"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
 RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
 RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
 MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
@@ -29,37 +34,74 @@ LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
 3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
 A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
 7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>van Valkenhoef</md:SurName>
-    <md:EmailAddress>tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
+            <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
+RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
+MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
+UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
+dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
+bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
+h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
+CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
+Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
+inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
+AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
+GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
+MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
+cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
+Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
+MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
+LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
+3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
+A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
+7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
+0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Max Planck Institute for Psycholinguistics</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.mpi.nl/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tobias</GivenName>
+      <SurName>van Valkenhoef</SurName>
+      <EmailAddress>Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Dieter</GivenName>
+      <SurName>Van Uytvanck</SurName>
+      <EmailAddress>dieter.vanuytvanck@mpi.nl</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
new file mode 100644
index 00000000..22078e19
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onlinelibrary.wiley.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
+MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
+bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
+VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
+TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
+SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
+AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
+oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
+cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
+FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
+BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
+LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
+Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
+FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
+FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
+AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
+or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
+ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
+QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
+3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
+YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
+MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
+bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
+VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
+AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
+TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
+SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
+AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
+oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
+cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
+FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
+BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
+LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
+Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
+FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
+FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
+AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
+or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
+ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
+QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
+3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
+YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">John Wiley and Sons</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">John Wiley and Sons</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://onlinelibrary.wiley.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Sean</GivenName>
+      <SurName>Timmins</SurName>
+      <EmailAddress>stimmins@wiley.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Chris</GivenName>
+      <SurName>Potter</SurName>
+      <EmailAddress>cpotter@wiley.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com.xml b/swamid-interfederations-2.0/sp.tshhosting.com.xml
new file mode 100644
index 00000000..a0943df9
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.tshhosting.com.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tshhosting.com/shibboleth">
+    <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://www.isiknowledge.com/" 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://www.webofknowledge.com/" index="2"/>
+        <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.webofknowledgev4.com/" index="3"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shib.tshhosting.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shib.tshhosting.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=Thomson Scientific,O=Thomson Reuters (Tax &amp; Accounting) Inc.,L=East Haven,ST=Connecticut,C=US</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF7jCCBNagAwIBAgIQE6nUqB9NUlBYPyzlywMpUjANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzA2
+MDAwMDAwWhcNMTIwNzEwMjM1OTU5WjCB2jELMAkGA1UEBhMCVVMxFDASBgNVBAgT
+C0Nvbm5lY3RpY3V0MRMwEQYDVQQHFApFYXN0IEhhdmVuMTAwLgYDVQQKFCdUaG9t
+c29uIFJldXRlcnMgKFRheCAmIEFjY291bnRpbmcpIEluYy4xGzAZBgNVBAsUElRo
+b21zb24gU2NpZW50aWZpYzEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3dy52
+ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBNzaGliLnRzaGhvc3Rpbmcu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3478pCuAxKLWVx
+n6RDCOsnRHN4GP9Z10GWhuE9CTCe+Z95sfeMhwwbpYgclX0ygYv8ZTsDqfu6Ln78
+RDg/5G4H6ceA0dgiE7FT3yWCR/puIb8kWYgaq5XD5jq+e0cCWWeLhkL836D8LDuI
+OwKXvbbzaRql38RxJj59lg/XARc7j6UdMUPcKcJrkSeuMrn6gw626x4yL01R5uEc
+5s+VuwodLo1hTiRsewCOyfX0N7Fv16j8bxEecZtTfGOSL5FoxcjXjAf3JQcFoKr7
+76IY5ImPxNnS1vwfx84tWN0m/481ho/Q9rH15jChF/QXvIENCu/LUfURO0UajjHs
+yGADdQIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0f
+BD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMi1jcmwudmVyaXNpZ24uY29t
+L1NWUlNlY3VyZUcyLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
+KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFKXvCxHOwEEDo0plkEiy
+HOBXLX1HMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
+dmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUcyLWFp
+YS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzIuY2VyMG4GCCsGAQUFBwEMBGIwYKFe
+oFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4myms
+SweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAN
+BgkqhkiG9w0BAQUFAAOCAQEAH+DiV8qdzW762rt7SIY7+z9xJSobGqzQKZRRFv00
+0lt1peE/UDGyRSc7fSSfnCXgjKxYOLT43z0zFqvX2B3au1E9Sskk4IlBygjRkaJr
+jRYTJ4xBOMx6ppD93xXC59Unv9VwK5qo/qObqnMWz5ZPJBL8UOQ9QgXfQx0VJ4dx
+avmAGfeVrcSW8ih+s1KLD2D8F00a8A4wz5HvsGqL3zcph34ZrnHi0CKpOVW75LlZ
+kggo+nm06wWcaYtATsvsvkiBgFhnU8avQWMM7ienzabFPzABgjgq5OgDb6cc3cPm
+TbuT7A0uVRSN/CkntM5VSDg6KlZId4pE3QsD7TcsbMJirA==
+</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:1.0:profiles:browser-post" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Thomson Scientific</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Thomson Reuters - ISI Web of Knowledge and EndNote Web</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.thomsonreuters.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Manoj</GivenName>
+      <SurName>Panicker</SurName>
+      <EmailAddress>manoj.panicker@thomsonreuters.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Technical</GivenName>
+      <SurName>Support</SurName>
+      <EmailAddress>websupp@thomsonreuters.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.cesnet.cz.xml b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
new file mode 100644
index 00000000..ade2dc82
--- /dev/null
+++ b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp2.cesnet.cz/sp/shibboleth/edugain">
+
+    <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+        <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+            <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+            <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+        </mdrpi:RegistrationInfo>
+    </Extensions>
+
+
+  <md:SPSSODescriptor 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://sp2.cesnet.cz/edugain/Shibboleth.sso/DS" index="1"/>
+
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">  
+          <mdui:DisplayName xml:lang="en">CESNET Test SP</mdui:DisplayName>
+          <mdui:Description xml:lang="en">A test SP showing released attributes and SAML assertions.</mdui:Description>
+          <mdui:DisplayName xml:lang="cs">CESNET Test SP</mdui:DisplayName>
+          <mdui:Description xml:lang="cs">Testovací SP - ukazuje doručené atributy a SAML zprávy.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sp2.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
+          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
+LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
+U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
+kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
+ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
+Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
+NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
+AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
+eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
+MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
+Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
+gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
+Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
+LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
+ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
+MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
+AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
+Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
+PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
+0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
+035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
+OdbkmjrpK8okfqGw+9V2Sgk08Q==
+</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>sp2.cesnet.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
+          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
+LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
+U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
+kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
+ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
+Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
+NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
+AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
+eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
+MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
+Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
+gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
+Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
+LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
+ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
+MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
+AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
+Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
+PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
+0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
+035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
+OdbkmjrpK8okfqGw+9V2Sgk08Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+
+    <AttributeConsumingService xmlns="urn:oasis:names:tc:SAML:2.0:metadata" index="0">
+        <ServiceName xml:lang="en">CESNET Test SP</ServiceName>
+        <ServiceDescription xml:lang="en">Shows available attributes and assertions</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"/>
+        <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+        <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="email" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+        <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+        <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+        <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+    </AttributeConsumingService>
+
+  </md:SPSSODescriptor>
+
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+      <OrganizationName xml:lang="en">cesnet.cz</OrganizationName>
+      <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>eduID.cz</GivenName>
+      <SurName>Administrator</SurName>
+      <EmailAddress>eduid-admin@eduid.cz</EmailAddress>
+  </ContactPerson>
+
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.h-da.de.xml b/swamid-interfederations-2.0/sso.h-da.de.xml
new file mode 100644
index 00000000..fe8d3439
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.h-da.de.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.h-da.de/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>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">h-da.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sso.h-da.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
+dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
+CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
+gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
+dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
+IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
+8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
+ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
+Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
+UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
+IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
+AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
+GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
+QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
+dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
+TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
+tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
+igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
+Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
+e2RPyqbv/NPwrY+7bVC0ulE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.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://sso.h-da.de/idp/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.h-da.de/idp/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.h-da.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.h-da.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">h-da.de</saml1md:Scope>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>sso.h-da.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
+RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
+dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
+CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
+gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
+dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
+IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
+8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
+ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
+Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
+UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
+IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
+AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
+CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
+GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
+QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
+cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
+Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
+dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
+AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
+TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
+tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
+igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
+Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
+e2RPyqbv/NPwrY+7bVC0ulE=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.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">Hochschule Darmstadt</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Darmstadt, University of Applied Sciences</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.h-da.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Service Desk</GivenName>
+      <SurName>IT-Dienste und -Anwendungen</SurName>
+      <EmailAddress>it-service@h-da.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Service Desk</GivenName>
+      <SurName>IT-Dienste und -Anwendungen</SurName>
+      <EmailAddress>it-service@h-da.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org.xml
index c927e96b..fdc07ce4 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org.xml
@@ -1,31 +1,34 @@
 <?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="https://terena.org/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <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-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">TERENA</md:ServiceName>
-      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">TERENA</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">gives access to a Service Provider Proxy for all TERENA Federated Service</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
+    <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:KeyDescriptor use="signing">
+        <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 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: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: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/ticket.iop.org.xml b/swamid-interfederations-2.0/ticket.iop.org.xml
new file mode 100644
index 00000000..076eddf3
--- /dev/null
+++ b/swamid-interfederations-2.0/ticket.iop.org.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ticket.iop.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
+MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
+vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
+uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
+9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
+U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
+IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
+dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
+MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
+BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
+Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
+ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
+by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
+vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
+bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
+ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
+t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
+Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
+Ny/fu2lNRrmtoPmTctI=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ticket.iop.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
+MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
+vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
+uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
+9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
+U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
+IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
+dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
+MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
+BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
+Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
+ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
+by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
+vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
+bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
+ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
+t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
+Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
+Ny/fu2lNRrmtoPmTctI=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="7"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="9"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="10"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="11"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="12"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">IOP online services</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">IOP online services</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.iop.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Peter</GivenName>
+      <SurName>Haworth</SurName>
+      <EmailAddress>peter.haworth@iop.org</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Matt</GivenName>
+      <SurName>Keen</SurName>
+      <EmailAddress>matthew.keen@iop.org</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Keith</GivenName>
+      <SurName>Jones</SurName>
+      <EmailAddress>keith.jones@iop.org</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..c5ef6f26
--- /dev/null
+++ b/swamid-interfederations-2.0/tumidp.lrz.de.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/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>
+        <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>
+      <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">Universität München (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">TU München (TUM)</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ralf</GivenName>
+      <SurName>Ebner</SurName>
+      <EmailAddress>shibboleth@lrz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ralf</GivenName>
+      <SurName>Ebner</SurName>
+      <EmailAddress>shibboleth@lrz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
index 5c6b8d66..8d989123 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
@@ -1,31 +1,73 @@
 <?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="https://uat.leeds1.emeraldinsight.com/entity">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
-      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.leeds1.emeraldinsight.com/entity">
+    <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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://uat.leeds1.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+        <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"/>
+        <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"/>
+        <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"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.emeraldinsight.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.emeraldinsight.com,O=shibboleth.emeraldinsight.com,OU=Domain Control Validated,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkG
+A1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQK
+ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBW
+YWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAx
+CzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQx
+JjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQD
+DB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGS
+Vwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv
+85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh5
+2zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1
+waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG6
+4NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8G
+A1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5
+BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQv
+ZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2ln
+bi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFo
+SkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIB
+CjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9z
+aXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRo
+LmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsy
+i/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHb
+JbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo
+84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLS
+n+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5
+EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN
+8tRYvG1sXw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <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="de">Emerald Group Publishing Limited</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Emerald Insight</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.emeraldinsight.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Laurence</GivenName>
+      <SurName>Parkin</SurName>
+      <EmailAddress>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..2a1db25f
--- /dev/null
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ufal-point.mff.cuni.cz</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ufal-point.mff.cuni.cz,O=Charles University in Prague,C=CZ</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRAKjpp7DA4H2hg++pA+mOlMgwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTExMTIwMDAwMDBaFw0xMjExMTEyMzU5NTlaMFUxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
+HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA1Xo+J8TeS6GO73Qxr9EmVkcsblx6731iPj5CzANbEWr5
+61cecUEXpI2ajO7eWp8jRR1rxrd35i/Stlv1WZcP3jnXTz0mU6CHDBepJsYPfVGe
+Fg+ILOrHD+CpbRVF2Wo8AM3M9eOmZgoUIRYobWXfUHiNAYyQcenJBwwia2nPC2Ib
+JjD0FF/wNgj+rEvn8lgedspB3XeDNWTQ5F9H6qedaU5XT1WfjXhy96/RZPlwwNmF
+zidSxBIlaEb7+wFPudDlza8cE4JgY+he+2dDKMIkunktD2DhonXsV6ZpIFSGxP2b
+rYZeiYbr88fp5GayFXJN9KUqbl1ARTXalVxAJ7V0pwIDAQABo4IBaTCCAWUwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFAwsaQOpPlaf
+JXrSwflMCBtMEBk6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
+cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBACdkrEzn+hTfTX6C
+LSQy8a8UpuSnGt/DNsOZHItRg7OECskaB8NcDhWKukcCDHjDDlmTEC3Eje55tZVG
+E1p1ke4EKUwNSHLUCEMB5mFUh9/eFfrkywFhIkjG8Wohg+SS0XR8ZR9+gYK2Sep0
+0xj1J343h8MGXDGTlQWVmPN+a8t2Zu2kSy1d/rjyQ4DYNA6fDdmRlYz/+MWiNblM
+Y65ck8X2GhA2cvKX+jgIe7nvqwl6qbxaViRz6L+t180pKlej1FFKl3Cn2yYi7Qg3
+YDWak/DBKct67w4jOIYCFnTzxNS6JQ5snC1ambBZdOi6Tqejx51iThFYfCzegsXk
+qw/X0vc=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>ufal-point.mff.cuni.cz</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=ufal-point.mff.cuni.cz,O=Charles University in Prague,C=CZ</ds:X509SubjectName>
+            <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRAKjpp7DA4H2hg++pA+mOlMgwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTExMTIwMDAwMDBaFw0xMjExMTEyMzU5NTlaMFUxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
+HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA1Xo+J8TeS6GO73Qxr9EmVkcsblx6731iPj5CzANbEWr5
+61cecUEXpI2ajO7eWp8jRR1rxrd35i/Stlv1WZcP3jnXTz0mU6CHDBepJsYPfVGe
+Fg+ILOrHD+CpbRVF2Wo8AM3M9eOmZgoUIRYobWXfUHiNAYyQcenJBwwia2nPC2Ib
+JjD0FF/wNgj+rEvn8lgedspB3XeDNWTQ5F9H6qedaU5XT1WfjXhy96/RZPlwwNmF
+zidSxBIlaEb7+wFPudDlza8cE4JgY+he+2dDKMIkunktD2DhonXsV6ZpIFSGxP2b
+rYZeiYbr88fp5GayFXJN9KUqbl1ARTXalVxAJ7V0pwIDAQABo4IBaTCCAWUwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFAwsaQOpPlaf
+JXrSwflMCBtMEBk6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
+cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBACdkrEzn+hTfTX6C
+LSQy8a8UpuSnGt/DNsOZHItRg7OECskaB8NcDhWKukcCDHjDDlmTEC3Eje55tZVG
+E1p1ke4EKUwNSHLUCEMB5mFUh9/eFfrkywFhIkjG8Wohg+SS0XR8ZR9+gYK2Sep0
+0xj1J343h8MGXDGTlQWVmPN+a8t2Zu2kSy1d/rjyQ4DYNA6fDdmRlYz/+MWiNblM
+Y65ck8X2GhA2cvKX+jgIe7nvqwl6qbxaViRz6L+t180pKlej1FFKl3Cn2yYi7Qg3
+YDWak/DBKct67w4jOIYCFnTzxNS6JQ5snC1ambBZdOi6Tqejx51iThFYfCzegsXk
+qw/X0vc=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ufal-point.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Charles University Prague, UFAL MFF UK</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Charles University Prague, UFAL MFF UK</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://ufal.mff.cuni.cz/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Karel</GivenName>
+      <SurName>Vandas</SurName>
+      <EmailAddress>vandas@ufal.mff.cuni.cz</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
new file mode 100644
index 00000000..e692be14
--- /dev/null
+++ b/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webapp.rz.rwth-aachen.de/partner/shibboleth">
+    <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://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
+MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
+U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
+o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
+oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
+tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
+k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
+ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
+BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
+cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
+AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
+S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
+di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
+Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
+iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
+DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
+RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
+MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
+MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
+ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
+IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
+dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
+U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
+o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
+oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
+tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
+k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
+ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
+BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
+cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
+AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
+S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
+di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
+Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
+iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
+DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.rz.rwth-aachen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Wilfred</GivenName>
+      <SurName>Gasper</SurName>
+      <EmailAddress>gasper@rz.rwth-aachen.de</EmailAddress>
+    </ContactPerson>
+  </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
new file mode 100644
index 00000000..55a00cb7
--- /dev/null
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <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
+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>
+      <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"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Abteilung Allgemeine Sprachwissenschaft und Computerlinguistik, Seminar für Sprachwissenschaft, Universität Tübingen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Allgemeine Sprachwissenschaft und Computerlinguistik, Universität Tübingen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.sfs.uni-tuebingen.de/index.shtml?context=ascl</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Thomas</GivenName>
+      <SurName>Zastrow</SurName>
+      <EmailAddress>thomas.zastrow@uni-tuebingen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
new file mode 100644
index 00000000..2cf9249d
--- /dev/null
+++ b/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://webshop.rz.uni-wuerzburg.de/shibboleth">
+    <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://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
+KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
+fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
+xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
+/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
+eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
+AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
+s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
+b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
+oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
+YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
+Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
+I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
+uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
+zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
+cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
+Z8hLHkleuQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
+KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
+fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
+xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
+/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
+eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
+AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
+s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
+b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
+oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
+YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
+Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
+Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
+I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
+uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
+zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
+cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
+Z8hLHkleuQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg Webshop</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Hartmut</GivenName>
+      <SurName>Plehn</SurName>
+      <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Rossa</SurName>
+      <EmailAddress>leitung@rz.uni-wuerzburg.de</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..3a95a4d8
--- /dev/null
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://whoami.cesnet.cz/idp/shibboleth">
+
+    <Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+        
+        <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>
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+                <mdui:DisplayName xml:lang="en">CESNET IdP</mdui:DisplayName>
+                <mdui:Description xml:lang="en">Identity Provider for all CESNET members</mdui:Description>
+                <mdui:DisplayName xml:lang="cs">CESNET IdP</mdui:DisplayName>
+                <mdui:Description xml:lang="cs">Identity Provider pro členy CESNET, z. s. p. o.</mdui:Description>
+                <mdui:InformationURL xml:lang="en">http://www.eduid.cz/wiki/en/</mdui:InformationURL>
+                <mdui:InformationURL xml:lang="cs">http://www.eduid.cz/</mdui:InformationURL>
+            </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:2.0:nameid-format:transient</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.cz</OrganizationName>
+        <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
+        <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
+    </Organization>
+
+    <ContactPerson contactType="technical">
+        <GivenName>eduID.cz</GivenName>
+        <SurName>Administrator</SurName>
+        <EmailAddress>eduid-admin@eduid.cz</EmailAddress>
+    </ContactPerson>
+    
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml b/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
new file mode 100644
index 00000000..a48d1cc7
--- /dev/null
+++ b/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.imz.hs-furtwangen.de/shibboleth">
+    <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://wiki.imz.hs-furtwangen.de/Shibboleth.sso/Login" index="1"/>
+        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
+Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
+MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
+ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
+IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
+BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
+x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
+rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
+TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
+QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
+vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
+EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
+YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
+LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
+bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
+dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
+SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
+bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
+bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
+kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
+PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
+40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
+nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
+Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
+MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
+ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
+IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
+BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
+x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
+rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
+TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
+QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
+vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
+EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
+YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
+LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
+hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
+bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
+dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
+SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
+bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
+bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
+kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
+PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
+40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
+nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">HFU</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Hendrik</GivenName>
+      <SurName>Kuijs</SurName>
+      <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml b/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
new file mode 100644
index 00000000..aaa26589
--- /dev/null
+++ b/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wtc.tu-chemnitz.de/shibboleth">
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
+MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
+yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
+3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
+pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
+sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
+9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
+e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
+WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
+jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
+r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
+H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
+qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
+MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
+yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
+3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
+pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
+sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
+9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
+e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
+WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
+jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
+r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
+H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
+qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/Artifact" index="1"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wtc.tu-chemnitz.de/shibboleth-idp/SSO"/>
+    </IDPSSODescriptor>
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <Extensions>
+        <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
+MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
+yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
+3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
+pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
+sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
+9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
+e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
+WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
+jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
+r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
+H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
+qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
+MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
+yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
+3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
+pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
+sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
+9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
+e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
+WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
+jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
+r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
+H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
+qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/AA"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">TU Chemnitz</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ronald</GivenName>
+      <SurName>Schmidt</SurName>
+      <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ronald</GivenName>
+      <SurName>Schmidt</SurName>
+      <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wws.redi-bw.de.xml b/swamid-interfederations-2.0/wws.redi-bw.de.xml
new file mode 100644
index 00000000..42d9dae9
--- /dev/null
+++ b/swamid-interfederations-2.0/wws.redi-bw.de.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wws.redi-bw.de">
+    <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://wws-fr.redi-bw.de/Shibboleth.sso/DS" 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://wws-s.redi-bw.de/Shibboleth.sso/DS" index="2"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>wws.redi-bw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=wws.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIEENaFljANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTEwMTAxNDEzMzkxOVoXDTE1
+MTAxMzEzMzkxOVowgbgxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVy
+dHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRcw
+FQYDVQQDEw53d3MucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0ByZWRp
+LWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0miEzWvjAqrX
+oT2H0778Bdd9+TLJD/jxbx7+fy0oN0NJF9nocIxMfMXiYFKWJy5dY0XEx7/33DKY
+5Df66Wk8o1x97xa9LGEaXe0+glZyaDsNKStlY1kW6pM/ohVUIXlHZGnDVLz+4yzh
+XPT/besq9w1YkUDI8R5zXhXgod7WsRXPaGlDj+MYd4+xAX5vPqga0KRtc9gwshKT
+Y+xrtD2W3Y4ynzMUT7N5OvPLF/Q807P5bHf3IaZ7PWhm1PF0FN5IOvw9iUci1hqo
+gRhR4q/ImFAOwUu0jkPdrU5RGauTAMI8rPdujB/FirqMdyCQbYZs3MgVRd3kq7nt
+hCcxIaTS8QIDAQABo4ICCTCCAgUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSMk/NR+7fUmRRd
+PORgM+0wtrTYSTAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTBPBgNV
+HREESDBGgQ9pbmZvQHJlZGktYncuZGWCDnd3cy5yZWRpLWJ3LmRlghF3d3MtZnIu
+cmVkaS1idy5kZYIQd3dzLXMucmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8
+hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3Js
+L2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1m
+cmVpYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCB
+mDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1
+cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRsfDQbyon67pB4jiHwtfok+nY
+dYgba+x93m6uO8+RD2MPBBhcVFF4uHfStxhRe8lttNNboTf7g/D4y041ZGSmQH/e
+YqRBVK5WiedYXpyFjB7tzjOmMsFKYEV5MRLpjt7V7y9cKPCFXGXwSvMgAWUHrSs5
+GoWj/xAoOWglllrxwC+gmwaPM8LNSbHDDh8QhA6NJYbYO9fUyLnI2ajgSjar4aTy
+/kygbVgZgqnFGd9prygGXaIc3hLkWcUQGS6t6NP2Ryt4i2w8Ib9ubnjgojS9e+x2
+TL82eFket8If6svRH9dTJHSQS+F2LmjUVQSSPyVt8ZUBFacRauRMyCQ9Ne3h
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="7"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="8"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ReDI Perinorm-Server</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.redi-bw.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Hans-Adolf</GivenName>
+      <SurName>Ruppert</SurName>
+      <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>ReDI</GivenName>
+      <SurName>Team</SurName>
+      <EmailAddress>info@redi-bw.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-fr.redi-bw.de.xml b/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
new file mode 100644
index 00000000..83fce5d2
--- /dev/null
+++ b/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-fr.redi-bw.de">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
+MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
+GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
+ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
+yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
+p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
+wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
+BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
+Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
+8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
+ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
+BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
+X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
+aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
+SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
+LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
+nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
+J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
+Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
+x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
+yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
+MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
+GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
+ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
+yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
+p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
+wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
+BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
+Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
+8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
+ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
+BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
+X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
+aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
+SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
+LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
+nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
+J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
+Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
+x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
+yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
+      <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://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ReDI Freiburg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Hans-Adolf</GivenName>
+      <SurName>Ruppert</SurName>
+      <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>ReDI</GivenName>
+      <SurName>Team</SurName>
+      <EmailAddress>info@redi-bw.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-s.redi-bw.de.xml b/swamid-interfederations-2.0/www-s.redi-bw.de.xml
new file mode 100644
index 00000000..153c04db
--- /dev/null
+++ b/swamid-interfederations-2.0/www-s.redi-bw.de.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-s.redi-bw.de">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
+MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
+FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
+ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
+7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
+NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
+P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
+PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
+igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
+QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
+BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
+nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
+A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
+Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
+YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
+5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
+rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
+dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
+7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
+5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
+REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
+aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
+AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
+MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
+ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
+FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
+ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
+7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
+NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
+P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
+PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
+igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
+QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
+BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
+nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
+A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
+dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
+Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
+YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
+BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
+Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
+cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
+5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
+rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
+dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
+7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
+5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
+      <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://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">ReDI Stuttgart</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Hans-Adolf</GivenName>
+      <SurName>Ruppert</SurName>
+      <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>ReDI</GivenName>
+      <SurName>Team</SurName>
+      <EmailAddress>info@redi-bw.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ascopubs.org.xml b/swamid-interfederations-2.0/www.ascopubs.org.xml
new file mode 100644
index 00000000..675778e6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ascopubs.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ascopubs.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.ascopubs.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.b2i.de.xml b/swamid-interfederations-2.0/www.b2i.de.xml
new file mode 100644
index 00000000..2eb8f045
--- /dev/null
+++ b/swamid-interfederations-2.0/www.b2i.de.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.b2i.de/shibboleth">
+    <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://www.b2i.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.b2i.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.b2i.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHEnRZn3AzVDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
+BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
+c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
+9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA3WhcNMTYw
+ODIyMTExMDA3WjCBkjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
+A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
+dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRMwEQYD
+VQQDEwp3d3cuYjJpLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+uXCPIiALHLNEC6a5kbCcJTiJoZ6Pn8OnSI5Mw4VhFMcnkOvMorpt/R4/3kioT3gL
+KRUhFDgWyO2pty8Q4xlyPRHGlt938C5XXvfcY9rzLgABKSn2+rjhb2bMS5Zlz+aW
+88r04kvZgR4PlmZa0GyXj/eWowh9Ic0tU6uh8g4RIdaryHuqbbqpFEAkONNIoH1g
+M+4CNSmj36LQNQFo+2ov3DyZ/dJt9jth4T5M1m03NeILolNujzW5Ce+JO0gHFDWJ
+Qp9+w13RDGDNQJuTfBYvhOfxPU2FrgdOkZaA7XDbmBVAQLhen/0AV98i3PXOvAID
+mmLoiqjhi+qS5OnPygeahQIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADALBgNVHQ8E
+BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSv
++qt8pTd2pwww9zj3CUvf/TbPqjAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMhWhsqivOf
+MeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNy
+bC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJpc2NoZS1z
+dGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBygYIKwYB
+BQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+YmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5
+ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAK6JlbJ+37MzXm6R6Lh0W9KsTc/ZYLdI
+QYxxeDiV8axPHmKhtnG/hhWucv0f2fG2gDi0kjSExZ4lpSfX0acTXv6CIF2zQMdG
+w9cCFbDZ8h2SgnH/tBb0/+M6bws1Xv0laxC9BZ7xAjVZq2d+YO4hTqQZCDvhcoR/
+B5aqFOuOpmXbjpP9ZeA9fMriC3GnB6JiAbPPzDEZgPGykcVl98lpQsFBcj8bNxRH
+eOe0rKs4xT+t4l/p5hbSp31Yef3mXJFRcXUtGjxuugaHYppXygc2v1iq9cletQoT
+k2wV8azDBD0V9CSHPwtltUaABXeMzxIGmTStfUIQeQ6+Aflofj72TfM=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.b2i.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.b2i.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.b2i.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.b2i.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com.xml b/swamid-interfederations-2.0/www.dawsonera.com.xml
new file mode 100644
index 00000000..f1f6c221
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dawsonera.com.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dawsonera.com/shibboleth">
+    <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://www.dawsonera.com/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.dawsonera.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
+MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
+aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
+qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
+hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
+TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
+T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
+AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
+hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
+PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
+ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
+yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
+Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
+A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.dawsonera.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
+aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
+MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
+aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
+qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
+hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
+TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
+T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
+AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
+hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
+PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
+ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
+yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
+Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
+A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Dawson Books</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">dawsonera</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dawsonbooks.co.uk</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Claire</GivenName>
+      <SurName>Chandler</SurName>
+      <EmailAddress>claire.chandler@dawsonbooks.co.uk</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Jude</GivenName>
+      <SurName>Norris</SurName>
+      <EmailAddress>jude.norris@dawsonbooks.co.uk</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dbod.de.xml b/swamid-interfederations-2.0/www.dbod.de.xml
new file mode 100644
index 00000000..8549d461
--- /dev/null
+++ b/swamid-interfederations-2.0/www.dbod.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dbod.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.dbod.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
+MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
+e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
+LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
+25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
+j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
+dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
+AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
+XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
+GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
+hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
+X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
+ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
+CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
+zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
+pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
+rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
+ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
+yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.dbod.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
+REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
+BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
+SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
+MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
+BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
+YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
+BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
+e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
+LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
+25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
+j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
+dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
+AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
+XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
+GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
+hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
+X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
+ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
+CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
+LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
+dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
+zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
+pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
+rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
+ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
+yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dbod.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dbod.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dbod.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">DBoD</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">DBoD - Databases on Demand</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.dbod.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Falk</GivenName>
+      <SurName>Niederlein</SurName>
+      <EmailAddress>niederl@slub-dresden.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elearning.tum.de.xml b/swamid-interfederations-2.0/www.elearning.tum.de.xml
new file mode 100644
index 00000000..0df004f6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.elearning.tum.de.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elearning.tum.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.elearning.tum.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
+BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
+NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
+aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
+GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
+pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
+0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
+QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
+A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
+umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
+8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
+dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
+aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
+CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
+oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
+2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
+nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
+eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
+yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
+CXA=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.elearning.tum.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
+RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
+BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
+NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
+YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
+aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
+GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
+pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
+0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
+QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
+A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
+umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
+EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
+8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
+dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
+aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
+MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
+cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
+L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
+CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
+oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
+2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
+nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
+eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
+yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
+CXA=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elearning.tum.de/ACS" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität München (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Zentrale Lernplattform der TU München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Stephan</GivenName>
+      <SurName>Graf</SurName>
+      <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Stephan</GivenName>
+      <SurName>Graf</SurName>
+      <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
index 5405fd3f..3de97c06 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com.xml
@@ -1,31 +1,110 @@
 <?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="https://www.emeraldinsight.com/entity">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkGA1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAxCzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQDDB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGSVwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh52zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG64NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8GA1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFoSkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUFBwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIBCjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9zaXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsyi/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHbJbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLSn+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN8tRYvG1sXw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
-      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">provide personalized access to journals and papers on social sciences</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">give adgang til EmeraldInsights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/entity">
+    <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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/UKFederation" 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://www.emeraldinsight.com/Shibboleth.sso/auth/DS/Kalmar2" index="2"/>
+        <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"/>
+        <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"/>
+        <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"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.emeraldinsight.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.emeraldinsight.com,O=shibboleth.emeraldinsight.com,OU=Domain Control Validated,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkG
+A1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQK
+ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBW
+YWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAx
+CzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQx
+JjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQD
+DB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGS
+Vwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv
+85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh5
+2zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1
+waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG6
+4NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8G
+A1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5
+BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQv
+ZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2ln
+bi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFo
+SkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIB
+CjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9z
+aXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRo
+LmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsy
+i/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHb
+JbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo
+84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLS
+n+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5
+EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN
+8tRYvG1sXw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.emeraldinsight.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.emeraldinsight.com,O=shibboleth.emeraldinsight.com,OU=Domain Control Validated,C=GB</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFEzCCA/ugAwIBAgILAQAAAAABLlieGjMwDQYJKoZIhvcNAQEFBQAwcTELMAkG
+A1UEBhMCQkUxHTAbBgNVBAsTFERvbWFpbiBWYWxpZGF0aW9uIENBMRkwFwYDVQQK
+ExBHbG9iYWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIERvbWFpbiBW
+YWxpZGF0aW9uIENBMB4XDTExMDIyNDE2MTAxNloXDTEzMDIyNDE2MTAxMVowgYAx
+CzAJBgNVBAYTAkdCMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQx
+JjAkBgNVBAoMHXNoaWJib2xldGguZW1lcmFsZGluc2lnaHQuY29tMSYwJAYDVQQD
+DB1zaGliYm9sZXRoLmVtZXJhbGRpbnNpZ2h0LmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMoXI+n3JvgM6LIaYvSRgiJ44vRHXj0VnHsRDDlMevGS
+Vwq5wLk0qI3iQEE12jOxcwx1kAcRmlrNdBwm0DusVSW2HGuODeSF+gqpGKqTayMv
+85op4x7IpAgUQmkaHZKGMY9NFGHOFcUcD8Bk2h9ytmjBnGyi0f0dF+gQj3sv8rh5
+2zK5OVv/XR6wcYSE/rGGu+nU4OK3o7g3qr5sod9PgTaiyu26zA0miVTrQCEmHQn1
+waLwRoz358JWXlAAvjATMirJ+KhIsNVBPSxnPcaxPLQqXXI+C5hagIG+oQ0glTG6
+4NstlDXvLCw1BSzlpDgqGYAgdJTOz3OBRP/f5OKbLsUCAwEAAaOCAZowggGWMB8G
+A1UdIwQYMBaAFDYSTp5xxCZB8frxKUy/F6RTKLbrMEkGCCsGAQUFBwEBBD0wOzA5
+BggrBgEFBQcwAoYtaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQv
+ZHZoZTEuY3J0MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwuZ2xvYmFsc2ln
+bi5uZXQvRG9tYWluVmFsMS5jcmwwHQYDVR0OBBYEFNr8wdf+AlkNufl44T52cIFo
+SkUnMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgTwMCkGA1UdJQQiMCAGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAzBLBgNVHSAERDBCMEAGCSsGAQQBoDIB
+CjAzMDEGCCsGAQUFBwIBFiVodHRwOi8vd3d3Lmdsb2JhbHNpZ24ubmV0L3JlcG9z
+aXRvcnkvMBEGCWCGSAGG+EIBAQQEAwIGwDAoBgNVHREEITAfgh1zaGliYm9sZXRo
+LmVtZXJhbGRpbnNpZ2h0LmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAW6Z0AgKjlbsy
+i/1EcEQC1ArGYeq6DomTtkpQWFSGWmOkCPpD6l6KJT7Q3/UgbHeCrbmwSwiADYHb
+JbJUNvQZoxKLcUMOJKA52mTdV8MGh0FBOvwzA8abBT955AI0SNma4CAW7UH0OaNo
+84PVLAbkDwdhU5TV3LktFIIPyBQLARm07IkmJZ2YdP2zl2BcbrozDy0YHs2dxhLS
+n+Uh3XrlH12VPHB7GzzeGD54XjjYGLqMoAKHGEqvVpF8hj+lemucvUuy6itdEPU5
+EgoAU+Pxlw8o+iHNxQ336Od77RWrw4Wa+gD0L6sIdZEOhbCSGLIjPwtEJmKWKaXN
+8tRYvG1sXw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <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="de">Emerald Group Publishing Limited</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Emerald Insight</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.emeraldinsight.com</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Laurence</GivenName>
+      <SurName>Parkin</SurName>
+      <EmailAddress>lparkin@emeraldinsight.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml b/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
new file mode 100644
index 00000000..c0691fe9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.hds.uni-leipzig.de/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
+MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
+TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
+JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
+Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
+k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
+ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
+aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
+s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
+ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
+gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
+GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
+eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
+B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
+41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
+vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
+P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
+P4AvrRjtlBBB
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
+RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
+MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
+EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
+MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
+TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
+JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
+Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
+k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
+ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
+aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
+s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
+ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
+gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
+GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
+L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
+Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
+dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
+eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
+B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
+41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
+vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
+P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
+P4AvrRjtlBBB
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen - Typo3</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.hds.uni-leipzig.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Stefan</GivenName>
+      <SurName>Moch</SurName>
+      <EmailAddress>admin@bps-system.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.historicum.net.xml b/swamid-interfederations-2.0/www.historicum.net.xml
new file mode 100644
index 00000000..480f0ea0
--- /dev/null
+++ b/swamid-interfederations-2.0/www.historicum.net.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.historicum.net/shibboleth">
+    <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://www.historicum.net/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.historicum.net</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
+BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
+c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
+9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
+ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
+A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
+dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
+VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
+kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
++qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
+/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
+V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
+3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
+syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
+cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
+3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
+2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
+bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
+J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
+IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
+CQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.historicum.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.historicum.net/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.historicum.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.historicum.net/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jstor.org.xml b/swamid-interfederations-2.0/www.jstor.org.xml
new file mode 100644
index 00000000..248b5ce3
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jstor.org.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jstor.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.jstor.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
+ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
+VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
+MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
+EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
+Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
+MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
+FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
+IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
+LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
+UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
+xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
+X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
+bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
+hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
+pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
+MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
+Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
+MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
+hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
+YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
+XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
+rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
+DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
+zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
+RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
+UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
+Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
+1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.jstor.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
+            <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
+ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
+VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
+MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
+EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
+Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
+MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
+FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
+IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
+LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
+UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
+xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
+X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
+bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
+hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
+pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
+MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
+Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
+MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
+hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
+YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
+XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
+rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
+DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
+zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
+RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
+UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
+Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
+1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://omega.jstor.org/action/samlACS" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.jstor.org/action/samlACS" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jstor.org/action/samlACS" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://firefly.jstor.org/action/samlACS" index="4"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">JSTOR</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">JSTOR</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.jstor.org</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Matt</GivenName>
+      <SurName>Callow</SurName>
+      <EmailAddress>support@jstor.org</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Tara</GivenName>
+      <SurName>Kalro</SurName>
+      <EmailAddress>tara.kalro@ithaka.org.org</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ken</GivenName>
+      <SurName>Alexander</SurName>
+      <EmailAddress>ken.alexander@ithaka.org</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jwatch.org.xml b/swamid-interfederations-2.0/www.jwatch.org.xml
new file mode 100644
index 00000000..59dbfc51
--- /dev/null
+++ b/swamid-interfederations-2.0/www.jwatch.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jwatch.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Journal Watch</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Journal Watch</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.jwatch.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.propylaeum.de.xml b/swamid-interfederations-2.0/www.propylaeum.de.xml
new file mode 100644
index 00000000..3d8d07d9
--- /dev/null
+++ b/swamid-interfederations-2.0/www.propylaeum.de.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.propylaeum.de/shibboleth">
+    <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://www.propylaeum.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.propylaeum.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.propylaeum.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzDCCBLSgAwIBAgIHEnRZnq0yrjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
+BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
+c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
+9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA2WhcNMTYw
+ODIyMTExMDA2WjCBmTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
+A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
+dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRowGAYD
+VQQDExF3d3cucHJvcHlsYWV1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAKFh9caPIFhS2jIdLooVk30LY730XWVZ1lmaMu7k3C0btX4Vjjl3htj4
+0Z3zDNCQl3R09ITueC+gyHV6ADKeQLCuNh3AlY7bXKukYufUzDkdmGo6QyCUU4X9
+0KWBGez3D1PMbEAv2ay3D57GLJwtRP4LO8x+Y+Z3g0i3kb+4rC/k58g/V4Utqk5d
+3nA/iFMh2aD6clHUQ/fUBgicdloy1NW8G8Y9YIIj7TZBxxegPaIFBlt443SHuhr0
+bJ6DbFdhq+n4FyNQh3BNe2bs3Nsx4g8neQ1QFZp80wV6wlarLfJuDWQdRxzJDwUo
+l0QHuYKNQ8aEUW9EWMTDd5i1z63ejY8CAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUBqxCuJApxSI5xMQce7FuA23RsgQwHwYDVR0jBBgwFoAUemeMWxoTRIKz
+IVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
+cmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVy
+aXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmww
+gcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQB6fmD4RCUhevBRvqaLb0sA
+gX2csj3pjfD+Q53sm6d1sk9CPuCMWYBHTUBKKIo6h9UZgGjj6NlmAt+iA9DxZHFY
+g+PSfw6t6SMvfZ7RslIcoZy4bsTLON71edCPccPWpKx7x0TSfg+aH+eu1kpSe47K
+R5TihEHKgIi36RCA6AY1JDDsNGjonZR4lG48NRXZ1HqY2Rh/kph3tNqfFQG9TkNj
+RtuYg/2um9+CjJnvI9wik7tMJKVkB2fToqRItNhxa7YEF001koHmSDZT7w3xAtQc
+ohe+mhgrSBbjpHrLTJhtrRalopdfAwCUGwWP4fZdikWiAjZmgFnUqYfTOQ+Qng/2
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.propylaeum.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rcpsych.org.xml b/swamid-interfederations-2.0/www.rcpsych.org.xml
new file mode 100644
index 00000000..5e5efdb1
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rcpsych.org.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rcpsych.org/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.rcpsych.org/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.reference-global.com.xml b/swamid-interfederations-2.0/www.reference-global.com.xml
new file mode 100644
index 00000000..5d1ae462
--- /dev/null
+++ b/swamid-interfederations-2.0/www.reference-global.com.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.reference-global.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.reference-global.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.reference-global.com,OU=Domain Control Validated - QuickSSL(R) Premium,OU=See www.geotrust.com/resources/cps (c)10,OU=GT86856594,O=www.reference-global.com,C=US,serialNumber=F64bTdYFo0e1I3PpwWZbE9qF8lv3gFV2</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDdTCCAt6gAwIBAgIDEK7BMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNDEzMTEwMTE3WhcNMTIwNjEzMDc1OTM5
+WjCB/zEpMCcGA1UEBRMgRjY0YlRkWUZvMGUxSTNQcHdXWmJFOXFGOGx2M2dGVjIx
+CzAJBgNVBAYTAlVTMSEwHwYDVQQKExh3d3cucmVmZXJlbmNlLWdsb2JhbC5jb20x
+EzARBgNVBAsTCkdUODY4NTY1OTQxMTAvBgNVBAsTKFNlZSB3d3cuZ2VvdHJ1c3Qu
+Y29tL3Jlc291cmNlcy9jcHMgKGMpMTAxNzA1BgNVBAsTLkRvbWFpbiBDb250cm9s
+IFZhbGlkYXRlZCAtIFF1aWNrU1NMKFIpIFByZW1pdW0xITAfBgNVBAMTGHd3dy5y
+ZWZlcmVuY2UtZ2xvYmFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+xGW90TpoiSz3aeTJn9sgOiPDvGWY+otD9xeJS3xjeca/iBeTKYtUMI5aIjb4B+DE
+bOV6pJubHlfnGKuAfLhGUEoIgxLypy0uxHicRjp9g/STNeEkYVPDTL+NMv5nS2Iq
+y2E74Mxkpk0wEljnVN8zFZuTLYgGQNhIv2g6xWJUVD0CAwEAAaOBrjCBqzAOBgNV
+HQ8BAf8EBAMCBPAwHQYDVR0OBBYEFHryJ6Umw2HfC1wUYi/3m+iy0G2AMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvc2VjdXJl
+Y2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQBCETxy0M7q
++E5Eq5Pb/23enEvUZVkBjdSvWmhrqj2XAxpZcEbLzscbcvAvDd1tO6w9m4oXFfSz
+peQvMRaw/8/85Ud7RXRx9Ql1xVW74kWOjfD3WHzJpRnsO3iLqp+7mLPfbZJe+Hj6
+kmjmbkbwJaC+fTIr9vRbKHG7B23wgCJqHg==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reference-global.com/action/samlACS" index="0"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Walter de Gruyter GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">De Gruyter</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.degruyter.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Frank</GivenName>
+      <SurName>Kebbedies</SurName>
+      <EmailAddress>fkebbedies@atypon.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ulrike</GivenName>
+      <SurName>Engel</SurName>
+      <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com.xml b/swamid-interfederations-2.0/www.rsmjournals.com.xml
new file mode 100644
index 00000000..cf2a5019
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rsmjournals.com.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rsmjournals.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
+Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
+NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
+2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
+JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
+GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
+EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
+8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
+eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
+mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
+aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
+gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
+5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
+f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
+BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
+Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
++d1ZBewNsC/cUy447ok=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="1"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.rsmjournals.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ryan</GivenName>
+      <SurName>Krebs</SurName>
+      <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml b/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
new file mode 100644
index 00000000..01bb4c66
--- /dev/null
+++ b/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ruhrcampusonline.de/shibboleth">
+    <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://www.ruhrcampusonline.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
+dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
+9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
+XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
+AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
+5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
+WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
+W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
+LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
+xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
+ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
+dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
+vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
+gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
+REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
+CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
+LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
+KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
+OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
+VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
+dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
+9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
+XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
+AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
+5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
+WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
+HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
+BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
+W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
+LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
+xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
+ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
+dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
+vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
+gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Tobias</GivenName>
+      <SurName>Hölterhof</SurName>
+      <EmailAddress>tobias.hoelterhof@uni-duisburg-essen.de</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..8a7377ef
--- /dev/null
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
+    <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>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.sso.uni-erlangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.sso.uni-erlangen.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIEDNx+ZTANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNVBAoT
+H1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJSWkUx
+DzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmktZXJs
+YW5nZW4uZGUwHhcNMDgwOTAyMDkwMTEwWhcNMTMwOTAxMDkwMTEwWjCBsDELMAkG
+A1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAm
+BgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNVBAsT
+KFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxIDAeBgNV
+BAMTF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA7ZK6l0S0z5W/y6WmBnaeCPwqtCv98rcGwpMSqcOFXZq2jf3Z
+vk3GjT+wC6UAnNXFYE1A4LMeg8bKwe03WfYEgC4Lms7HKAnq51q83Fxa1cOvxHsc
+FyXciv7ohOhOMLaINF5CHfysg9pC1G18gqrihwsMDTPx6E6nM6p5egg8rt2iI3Bz
+H3exTb0ot9acXLkWnrhr1cdSSlLzXO40l7irUmVz4c3/1KZxBtXyTdqCI0VIawC8
+77OXpIbYXZmFD7v7b4YsWguhcy2iKeEMrDkebqinv+L8l5UOmJLHkbmsCeMUOMZI
+6FjstpBZ25a15+wgFz57qAVCj6C+cK2XYuwaaQIDAQABo4ICADCCAfwwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSU/R53bBkEXqYy1dlF5FN/Ci2NfjAfBgNVHSMEGDAWgBT0c/P6
+xkKzxlxpwFi+dDj5YSuOYjAmBgNVHREEHzAdgRtpZG1vbmVAcnJ6ZS51bmktZXJs
+YW5nZW4uZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVy
+bmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgbgGCCsGAQUFBwEBBIGrMIGoMFIG
+CCsGAQUFBzAChkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1u
+dWVybmJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAR6jF33PmW
+3vFZCK7WwdERUVTPfxQMrdTWR5CaSfz1s4733V1e/zZdZrkgZVfbqW13jPiTXuTK
+MWJBMZluOr3Mipa+toGWV7Nng/JzyfHh3r1ymCeYKOtfiLV0JMm66BQ2678n+MHC
+vFwHs3l6nLx8K1rt6UdQXhsNtjKVS4Zn4sgnbWglA1yYxudGXvoDD62X1igubs0c
+S+V7E+DocEr+wK+V6TTIcUc5PJ+d85yGBjGxaAagw7WFSB/1kqk8e8Hm6UKDTlOj
+BdbyQDI4AYCeewd/9CT6UTcWzYTMgaAZajq6xUdtdsUj9phyrVtTt3LCrDpwKsVU
+2aijG0o5Oc1U
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.sso.uni-erlangen.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.sso.uni-erlangen.de,OU=Regionales Rechenzentrum Erlangen (RRZE),O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIEDNx+ZTANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMC
+REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNVBAoT
+H1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJSWkUx
+DzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmktZXJs
+YW5nZW4uZGUwHhcNMDgwOTAyMDkwMTEwWhcNMTMwOTAxMDkwMTEwWjCBsDELMAkG
+A1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAm
+BgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxMTAvBgNVBAsT
+KFJlZ2lvbmFsZXMgUmVjaGVuemVudHJ1bSBFcmxhbmdlbiAoUlJaRSkxIDAeBgNV
+BAMTF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA7ZK6l0S0z5W/y6WmBnaeCPwqtCv98rcGwpMSqcOFXZq2jf3Z
+vk3GjT+wC6UAnNXFYE1A4LMeg8bKwe03WfYEgC4Lms7HKAnq51q83Fxa1cOvxHsc
+FyXciv7ohOhOMLaINF5CHfysg9pC1G18gqrihwsMDTPx6E6nM6p5egg8rt2iI3Bz
+H3exTb0ot9acXLkWnrhr1cdSSlLzXO40l7irUmVz4c3/1KZxBtXyTdqCI0VIawC8
+77OXpIbYXZmFD7v7b4YsWguhcy2iKeEMrDkebqinv+L8l5UOmJLHkbmsCeMUOMZI
+6FjstpBZ25a15+wgFz57qAVCj6C+cK2XYuwaaQIDAQABo4ICADCCAfwwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB0GA1UdDgQWBBSU/R53bBkEXqYy1dlF5FN/Ci2NfjAfBgNVHSMEGDAWgBT0c/P6
+xkKzxlxpwFi+dDj5YSuOYjAmBgNVHREEHzAdgRtpZG1vbmVAcnJ6ZS51bmktZXJs
+YW5nZW4uZGUwgZ8GA1UdHwSBlzCBlDBIoEagRIZCaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MEigRqBEhkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVy
+bmJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgbgGCCsGAQUFBwEBBIGrMIGoMFIG
+CCsGAQUFBzAChkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1u
+dWVybmJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZo
+dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
+cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAR6jF33PmW
+3vFZCK7WwdERUVTPfxQMrdTWR5CaSfz1s4733V1e/zZdZrkgZVfbqW13jPiTXuTK
+MWJBMZluOr3Mipa+toGWV7Nng/JzyfHh3r1ymCeYKOtfiLV0JMm66BQ2678n+MHC
+vFwHs3l6nLx8K1rt6UdQXhsNtjKVS4Zn4sgnbWglA1yYxudGXvoDD62X1igubs0c
+S+V7E+DocEr+wK+V6TTIcUc5PJ+d85yGBjGxaAagw7WFSB/1kqk8e8Hm6UKDTlOj
+BdbyQDI4AYCeewd/9CT6UTcWzYTMgaAZajq6xUdtdsUj9phyrVtTt3LCrDpwKsVU
+2aijG0o5Oc1U
+</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">Universität Erlangen-Nürnberg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Universität Erlangen-Nürnberg</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Frank</GivenName>
+      <SurName>Tröger</SurName>
+      <EmailAddress>sso-admins@rrze.uni-erlangen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studisoft.de.xml b/swamid-interfederations-2.0/www.studisoft.de.xml
new file mode 100644
index 00000000..13e67a55
--- /dev/null
+++ b/swamid-interfederations-2.0/www.studisoft.de.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studisoft.de/shibboleth-sp">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.studisoft.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
+/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
+1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
+gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
+9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
+xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
+tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
+MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
+aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
+BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
+yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
+X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
+TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
+vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
+jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.studisoft.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
+V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
+MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
+HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
+bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
+/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
+1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
+gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
+9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
+xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
+tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
+KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
+MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
+aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
+Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
+BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
+bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
+yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
+X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
+TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
+vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
+jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/NIM/SOAP"/>
+      <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-SimpleSign" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studisoft.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sptest.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studisoft.de/Shibboleth.sso/SAML/Artifact" index="7"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg studisoft-sp</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Hartmut</GivenName>
+      <SurName>Plehn</SurName>
+      <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Christian</GivenName>
+      <SurName>Rossa</SurName>
+      <EmailAddress>leitung@rz.uni-wuerzburg.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.swetswise.com.xml b/swamid-interfederations-2.0/www.swetswise.com.xml
new file mode 100644
index 00000000..36b80662
--- /dev/null
+++ b/swamid-interfederations-2.0/www.swetswise.com.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.swetswise.com/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>shibboleth.swetswise.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=shibboleth.swetswise.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=SDC,O=Swets Information Services B.V.,L=Lisse,ST=Zuid-Holland,C=NL</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFVDCCBDygAwIBAgIQfAsfYeaJkMOkD6YbIZXGLDANBgkqhkiG9w0BAQUFADCB
+tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
+VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNjA4
+MDAwMDAwWhcNMTUwODA2MjM1OTU5WjCBxDELMAkGA1UEBhMCTkwxFTATBgNVBAgT
+DFp1aWQtSG9sbGFuZDEOMAwGA1UEBxQFTGlzc2UxKDAmBgNVBAoUH1N3ZXRzIElu
+Zm9ybWF0aW9uIFNlcnZpY2VzIEIuVi4xDDAKBgNVBAsUA1NEQzEzMDEGA1UECxQq
+VGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYD
+VQQDFBhzaGliYm9sZXRoLnN3ZXRzd2lzZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAJaCV/oHiN0Djbc0QfFHqJyl3dZLv6L14ixU7TRMhVBdm1EnsUhq
+JbqvF8DX9vCIa8BrShITPjXex+UpMpjdTr8V/nQGbQ7+NR4/HrV4g6ms4r8OVh8V
+ibGC2jqtNJF4NELRjdWdrkxhxoZcpn6rGYUjAPkvF2TpdFnL1hkJuhwLAgMBAAGj
+ggHRMIIBzTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2
+hjRodHRwOi8vU1ZSU2VjdXJlLUcyLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJl
+RzIuY3JsMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYc
+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUpe8LEc7AQQOjSmWQSLIc4FctfUcwdgYI
+KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
+b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9TVlJTZWN1cmUtRzItYWlhLnZlcmlzaWdu
+LmNvbS9TVlJTZWN1cmVHMi5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
+BQUAA4IBAQB6CxYoKRtfv/Wfw+bCZzxyBYZuqzY3DSzp+DpstY0UwqDQ1I7UVMFc
+EN1TQVEStKD3BlJUyUJnQlH3tMaRdWwqvi1of9adUQO/3u0mD0s6p5zOW2GKrEQM
+aCxJwOiYsWyk6LD2h8Gvx0eU2paPr+GR8MBB1m10icK5/YauDVh7z+Yk3NAgsv+u
+LvQirh8/tPxghLWofCqDMMHlGevdJ9IV6A5bEZ2FivhYqjKISMAN7vROy3wrr1cZ
+XYSgZsFGgkzcnZr1RJeNJ4WuY8ZQmsRoTnLV7fSRXHM/ykFZ8J9Z8rfOe2Fxp7+P
+hFcdbbuzmY4fmKSXQjAQgp4qquHXJRDr
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="0"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="7"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="8"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="9"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="10"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="11"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="12"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="13"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="14"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="15"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="16"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="17"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="18"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="19"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="20"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="21"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="22"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="23"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Swets Information Services B.V.</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">SwetsWise</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.swetswise.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Erwin</GivenName>
+      <SurName>Booy</SurName>
+      <EmailAddress>ebooy@nl.swets.com</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Kees Jan</GivenName>
+      <SurName>Voogd</SurName>
+      <EmailAddress>kjvoogd@nl.swets.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.thieme-connect.de.xml b/swamid-interfederations-2.0/www.thieme-connect.de.xml
new file mode 100644
index 00000000..9b70b5b6
--- /dev/null
+++ b/swamid-interfederations-2.0/www.thieme-connect.de.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.thieme-connect.de/ejournals/shib-login">
+    <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://www.thieme-connect.de/Shibboleth.sso/Login" index="1"/>
+        <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.thieme-connect.com/Shibboleth.sso/Login" index="2"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.thieme-connect.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
+vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
+GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
+MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
+MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
+MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
+y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
+vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
+AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
+OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
+Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
+cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
+AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
+Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
+BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
+a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
+dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
+zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
+yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
+XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
+ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
+nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.thieme-connect.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
+vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
+GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
+MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
+MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
+MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
+y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
+vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
+AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
+OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
+Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
+cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
+AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
+Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
+BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
+a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
+dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
+zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
+yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
+XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
+ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
+nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Artifact"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/SOAP"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST" index="7"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/ECP" index="10"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/POST" index="11"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/Artifact" index="12"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Georg Thieme Verlag KG</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">https://www.thieme-connect.de/</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.thieme-connect.de/ejournals/home.html</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Manfred</GivenName>
+      <SurName>Deutsch</SurName>
+      <EmailAddress>thiemedev@fiz-karlsruhe.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ute</GivenName>
+      <SurName>Günther</SurName>
+      <EmailAddress>ute.guenther@thieme.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tu-chemnitz.de.xml b/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
new file mode 100644
index 00000000..bd863bff
--- /dev/null
+++ b/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tu-chemnitz.de/shibboleth">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+      <KeyDescriptor use="encryption">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
+MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
+Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
+PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
+bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
+P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
+FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
+3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
+JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
+og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
+6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
+g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
+zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
+REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
+IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
+Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
+MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
+MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
+bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
+YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
+Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
+PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
+bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
+P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
+FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
+AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
+3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
+d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
+cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
+LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
+MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
+Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
+LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
+9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
+JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
+og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
+6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
+g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
+zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/Artifact" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/POST" index="2"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">www.tu-chemnitz.de</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Ronald</GivenName>
+      <SurName>Schmidt</SurName>
+      <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Ronald</GivenName>
+      <SurName>Schmidt</SurName>
+      <EmailAddress>hilfe@hrz.tu-chemnitz.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..16c1e9dc
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vho.de.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpnl">
+    <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">vho.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="encryption">
+        <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>
+      <KeyDescriptor use="signing">
+        <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/idpnl/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpnl/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+      <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>
+      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.vho.de/idpnl/profile/Shibboleth/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpnl/profile/SAML2/POST/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpnl/profile/SAML2/POST-SimpleSign/SSO"/>
+      <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpnl/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">vho.de</saml1md:Scope>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <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>
+      <KeyDescriptor use="encryption">
+        <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/idpnl/profile/SAML1/SOAP/AttributeQuery"/>
+      <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpnl/profile/SAML2/SOAP/AttributeQuery"/>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+      <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    </AttributeAuthorityDescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Verbundzentrale des Gemeinsamen Bibliotheksverbundes</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">VHO Nationallizenzen</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.gbv.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Gerald</GivenName>
+      <SurName>Steilen</SurName>
+      <EmailAddress>steilen@gbv.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Franck</GivenName>
+      <SurName>Borel</SurName>
+      <EmailAddress>franck.borel@ub.uni-freiburg.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Till</GivenName>
+      <SurName>Kinstler</SurName>
+      <EmailAddress>kinstler@gbv.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.video2brain.com.xml b/swamid-interfederations-2.0/www.video2brain.com.xml
new file mode 100644
index 00000000..9adc2928
--- /dev/null
+++ b/swamid-interfederations-2.0/www.video2brain.com.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.video2brain.com/shibboleth">
+    <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://www.video2brain.com/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.video2brain.com</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.video2brain.com,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)07,OU=GT17226173,O=www.video2brain.com,C=AT</ds:X509SubjectName>
+            <ds:X509Certificate>MIIDUzCCArygAwIBAgIDByeoMA0GCSqGSIb3DQEBBAUAMFoxCzAJBgNVBAYTAlVT
+MRwwGgYDVQQKExNFcXVpZmF4IFNlY3VyZSBJbmMuMS0wKwYDVQQDEyRFcXVpZmF4
+IFNlY3VyZSBHbG9iYWwgZUJ1c2luZXNzIENBLTEwHhcNMDcxMTE0MDgwMjA4WhcN
+MTIxMTEzMDgwMjA4WjCBwjELMAkGA1UEBhMCQVQxHDAaBgNVBAoTE3d3dy52aWRl
+bzJicmFpbi5jb20xEzARBgNVBAsTCkdUMTcyMjYxNzMxMTAvBgNVBAsTKFNlZSB3
+d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMDcxLzAtBgNVBAsTJkRv
+bWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3
+d3cudmlkZW8yYnJhaW4uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt
+iT25JCvwuRrgWEBtOd8CIbFDkHtu8DGcf3v7iufQ7H90e3k4bE/Skp92LsiezdQ8
+lzE3wprEnfKUqFu+tXez1kZQnpVHpmZ2I0tXHMRV1jUZPgj/MXSoLqGgLZgqlMPY
+DuppYTRNxhHxdzHbaQiegl7NiVMyp8WzkYm3m9vFPwIDAQABo4G9MIG6MA4GA1Ud
+DwEB/wQEAwIE8DAdBgNVHQ4EFgQUCADheYW7W9QQJWhQy6+U/+ThhcowOwYDVR0f
+BDQwMjAwoC6gLIYqaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9nbG9iYWxj
+YTEuY3JsMB8GA1UdIwQYMBaAFL6ooHRyUGtEt8kj2Puo/7NXa2hsMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEB
+BAUAA4GBAEuJO0nyUcTU9iutgqSO/5F6X+xB6DQiQTHQIwRH1ixxHZGBcQw93hEn
+GUAmvmBTIvFiU348WRkbzdePjyFtDughrlmfkPnV7uo8alWXq0eRJsAtlAzQXwlW
+tol6trKqCN9wsQnFTSaT8/J0pIcbanTtKvPVBwUIvU6y0ZoBfHVs
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.video2brain.com/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.video2brain.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">video2brain</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">video2brain</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.video2brain.com/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Ammar</GivenName>
+      <SurName>Aganovic</SurName>
+      <EmailAddress>aganovic@parkside.at</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Thomas</GivenName>
+      <SurName>Lauter</SurName>
+      <EmailAddress>tlauter@video2brain.com</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vifamusik.de.xml b/swamid-interfederations-2.0/www.vifamusik.de.xml
new file mode 100644
index 00000000..c87335c8
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vifamusik.de.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifamusik.de/shibboleth">
+    <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://www.vifamusik.de/Shibboleth.sso/DS" index="1"/>
+      </Extensions>
+      <KeyDescriptor use="signing">
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.historicum.net</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
+BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
+c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
+9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
+ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
+A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
+dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
+VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
+kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
++qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
+/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
+V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
+3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
+VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
+syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
+YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
+Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
+cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
+MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
+YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
+bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
+cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
+3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
+2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
+bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
+J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
+IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
+CQ==
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.vifamusik.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vifarom.de.xml b/swamid-interfederations-2.0/www.vifarom.de.xml
new file mode 100644
index 00000000..d0919354
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vifarom.de.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifarom.de/shibboleth">
+    <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://www.vifarom.de/Shibboleth.sso/Login" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www.vifarom.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www.vifarom.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHEnRY6lxAVTANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
+BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
+c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
+9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTEwNzA3WhcNMTYw
+ODIyMTEwNzA3WjCBljELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
+A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
+dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRcwFQYD
+VQQDEw53d3cudmlmYXJvbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMVCVmepur2mn7u0TH+e8FmYI2pDpSH5jvgZG2e97/iB26diSvba9zNQz64m
+WTJx7ZAKY3UYFd32qLNJ+0aNJ0cPzdB+fcOE7zVnVZLVvyiFn7/SLkP0F2DPSilX
+XDQYB9y5RZQt7MP0liE78qdQLNbw7EEuX9GZozpspMKelRskhzBXXcS5POYM/9b7
+e/vcaKmR10RKtapeiYma06DD+oyBVkWpmM0EGS9DzdtI629D3WfP+J4TPHnkeOz1
+JdZ5/qsclJH3iejl47e936qeTsDgMH+wD8teK9N6MZS6+y5bBnoCbOsX+Rf8HnQU
+KlOZxg8n0qTm4LWXIZfjRt/xhWsCAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
+FgQUx1w8vbdgEF52KU46RaAj5IwM650wHwYDVR0jBBgwFoAUemeMWxoTRIKzIVob
+KorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNhLmRm
+bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwv
+Y2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVyaXNj
+aGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmwwgcoG
+CCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2EuZGZu
+LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
+dC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBU8lbpQq5A7JJjsY9yACjaowfp
+NoP7w3+GisbTZFMXn+IHPlseyap7dBPFCVqxqjOT4bRiNKGmUa/upcZDSSZ3dwp7
+MggO8Nj+mPPUy88lY0IUjYNY5I+q3CAkpqV5MrQCxP19jwDNEPWXTjf3fIBAoDeo
+iTFSZYYAtPvA35TeyS/s7rwg/XvQ4/42XxOpkiV6363IObcIVgt9febaw8Z1sK2P
+6FzsA6UXH+xSh40bQV02YjuWrQtAK1dkjJmUrjQL5+t45hCO0lnYb3njX6oGzTSw
+7pkahKXfb58uiLQ9fj/0PEmoMlI00WUMINoB2jjwwA7gISALB3eB8V+9TKCU
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/SLO/SOAP"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Redirect"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SLO/POST"/>
+      <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Artifact"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/NIM/SOAP"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Redirect"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/NIM/POST"/>
+      <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Artifact"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifarom.de/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifarom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">https://www.vifarom.de</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="administrative">
+      <GivenName>Heinrich</GivenName>
+      <SurName>Wunderle</SurName>
+      <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.munzinger.de.xml b/swamid-interfederations-2.0/www2.munzinger.de.xml
new file mode 100644
index 00000000..b3acec40
--- /dev/null
+++ b/swamid-interfederations-2.0/www2.munzinger.de.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.munzinger.de/shibboleth">
+    <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://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/WAYF/CM" index="1"/>
+      </Extensions>
+      <KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:KeyName>www2.munzinger.de</ds:KeyName>
+          <ds:X509Data>
+            <ds:X509SubjectName>CN=www2.munzinger.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
+            <ds:X509Certificate>MIIFBTCCA+2gAwIBAgIEDG9M8jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
+RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
+AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODA2MTExMzEzMDZaFw0xMzA2
+MTAxMzEzMDZaMFAxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
+DgYDVQQLEwdERk4tUEtJMRowGAYDVQQDExF3d3cyLm11bnppbmdlci5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOouvAtoDQ13S1vtkcStbSTF+86X
+tE+aXnZdV6QakFLpdlHCbvjzkMw014S0cExxwV8XyDo9eTz3QqfMkUxAQMi9bDjh
+vCDby/9navCkBYFtU0ZXCVKy/07jsGn+wBN0mPtTatnDvdLnZjMgDMGDR7GFBFBa
+R+Z1X873XK7M506lDl7JQhNwmDgkJ5vOisrguTs9VVlqTu30SCqvrA18KuqSdc+N
++yC7Bqp7Keg/8j1lIjsfH9HXRpAiy4rDxmYN1WAS/sr4r8VhcGQUMletDgL/bOEa
+aAHbphz3cp/Oz2X6hpVpu1EHe0xabpKLdoyIhzwj9VdLnwFfiNz+ANgmPtsCAwEA
+AaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/OmtBwhF0wtWUf6Gs+gnRYZjoIsw
+HwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEXaG9z
+dG1hc3RlckBtdW56aW5nZXIuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDov
+L2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNy
+bC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
+Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBLBggr
+BgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
+Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFwrMvwYiwLfRsdnjMEWc9PWe54Wd3dU
+NiRSZSf73BaO75Jrp24kMrkjpby2SUNp0mkHtOJcYzzqMnM0cqxl+9HEhC0V0Dyw
+OS3I6/s+6G52kYuXklJ6cF/LAVInsBwypG7QGqQnSZLsdNLLHaqoqsitW9rghifn
+Cq6zE4S8CunLgcBuq6OqceH6UG5xCKok4CNu+CRP58gd/kOVBY9OMxKz2qd0SI+V
+V8pzrKBUVi+WWpDKk4Zl/WUkw2Wghb47KdkwoiAc+jxJKb+DmmJqRDHC2TDcz7+y
+gygw6R99wEGZNbIaNZXpwjroeAeNLtrGbBJPyfhQt3D1r/MYdepa4T8=
+</ds:X509Certificate>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </KeyDescriptor>
+      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
+      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
+    </SPSSODescriptor>
+    <Organization>
+      <OrganizationName xml:lang="de">Munzinger-Archiv GmbH</OrganizationName>
+      <OrganizationDisplayName xml:lang="de">Munzinger-Online</OrganizationDisplayName>
+      <OrganizationURL xml:lang="de">http://www.munzinger.de/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="administrative">
+      <GivenName>Bernhard</GivenName>
+      <SurName>Ziegler</SurName>
+      <EmailAddress>zi@munzinger.de</EmailAddress>
+    </ContactPerson>
+    <ContactPerson contactType="technical">
+      <GivenName>Willi</GivenName>
+      <SurName>Mader</SurName>
+      <EmailAddress>ma@munzinger.de</EmailAddress>
+    </ContactPerson>
+  </EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2011-12-02 23:00:11 +0100
committer	Leif Johansson <leifj@sunet.se>	2011-12-02 23:00:11 +0100
commit	efc81c59fde9c1706f43c6a8166226145c158b2d (patch)
tree	120e93940cbee10baf7593cf95b11c7d870591b2 /swamid-interfederations-2.0
parent	2aa3447dc0f5bfacb3d8c77ce26134d373757b0b (diff)