https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

63 files changed, 4260 insertions, 1 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
new file mode 100644
index 00000000..01371f28
--- /dev/null
+++ b/swamid-interfederations-1.0/.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-06-23T02:17:03Z">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-09-21T15:08:32Z" registrationAuthority="https://www.wayf.dk">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+          <mdui:Description xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</mdui:Description>
+          <mdui:Description xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</mdui:Description>
+          <mdui:DisplayName xml:lang="da">Ibistic Services</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">Ibistic Services</mdui:DisplayName>
+        </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHXzCCBkegAwIBAgIQDMeEM2c3CblrZFIKO0GQjzANBgkqhkiG9w0BAQsFADB1 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 d3cuZGlnaWNlcnQuY29tMTQwMgYDVQQDEytEaWdpQ2VydCBTSEEyIEV4dGVuZGVk IFZhbGlkYXRpb24gU2VydmVyIENBMB4XDTE1MDUwODAwMDAwMFoXDTE3MDUyNjEy MDAwMFowgfMxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYB BAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVz Z2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjE1MDELMAkGA1UEBhMCREsxEzARBgNV BAgMCkvDuGJlbmhhdm4xETAPBgNVBAcTCE5vcmRoYXZuMSkwJwYDVQQKEyBJYmlz dGljIFRlY2hub2xvZ2llcyBEZW5tYXJrIEEvUzEdMBsGA1UEAxMUc2VydmljZXMu aWJpc3RpYy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeu9hD FugX9bZh30fItW4XhUbcbWnPke78qYgoTI9xXEHYlgllWMta5/ETFcx1By9KQqlf uCj9gEJKZUrY7HkpUHcnBh9uy5AHKgr25nDQDexo4KEI6A7iFhhtm9XqeBTwbWDv 3hO797o5axvSVYihHgyP6XHU3J/NZWSVXj8hGpPNjFDl0Y55j35zVEKRIRlUgNQw idRtYlAUZ4psja65xxS3NVip92aQJbsUws2P4slMl/TOlRdUXFtuXjehR/0/DWr2 7RgTb/UveHVFwd49D7iHZASkupNoTkEXmABil2C3+x/aFrc+wL0zcuPLOa/omUmr wHjtUHz6a2ACn6sNAgMBAAGjggNqMIIDZjAfBgNVHSMEGDAWgBQ901Cl1qCt7vNK YApl0yHU+PjWDzAdBgNVHQ4EFgQUgqS5gDRU87YDX5zvYnkzGlGcF+YwHwYDVR0R BBgwFoIUc2VydmljZXMuaWJpc3RpYy5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB1BgNVHR8EbjBsMDSgMqAwhi5odHRw Oi8vY3JsMy5kaWdpY2VydC5jb20vc2hhMi1ldi1zZXJ2ZXItZzEuY3JsMDSgMqAw hi5odHRwOi8vY3JsNC5kaWdpY2VydC5jb20vc2hhMi1ldi1zZXJ2ZXItZzEuY3Js MEIGA1UdIAQ7MDkwNwYJYIZIAYb9bAIBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8v d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYgGCCsGAQUFBwEBBHwwejAkBggrBgEFBQcw AYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFIGCCsGAQUFBzAChkZodHRwOi8v Y2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRTSEEyRXh0ZW5kZWRWYWxpZGF0 aW9uU2VydmVyQ0EuY3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIB bgSCAWoBaAB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABTTJ8 GxYAAAQDAEYwRAIgBBRuMiDiJZa5zANatXS03c2D7qhpYfloN5oaK/T+OB0CIG/X gIau1AT8F/M5t0c6VCFTkQNhuAwE1Zqg6wETHKxbAHcAaPaY+B9kgr46jO65KB1M /HFRXWeT1ETRCmesu09P+8QAAAFNMnwa4wAABAMASDBGAiEA7Xw5JKAslun8W4fE pa/U8aOIU29tHxIb6/8wcAdsPDoCIQD74Zr3vEV9BnpvH0D2dEDvD4lPKgNJbbyD 3YXWfEPRLgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABTTJ8 HCEAAAQDAEcwRQIhAJQDPNlM/gc6dKnTZFtU2rB7f7btnNPF05x8C57I/rf8AiBY jeGTJ/QsymHdFFT124Qfbi10OMYBVLcWByRJpO3FeTANBgkqhkiG9w0BAQsFAAOC AQEAoshqkbqYBa5eoDKbF6JYoH7uLf4v82aVUi0zR1UDjF9gWYD8JKrlBbNQHtFu GoTsLcK2662DSXMpXPLtxKSnhIqfh2CrROCCrd4FX0gF8pCRrvkH4eW3fkEdoi/W ouuSogo4ESGhHPa/2MNtruvBbYW9bgdoRYZusjcRC619b/hf9cnEElqxh6QsOkXl LqJGnEPb6LeYVsyNxrlXQCZSre4npf/mLSnZG71+QxXjyphYRiGG0XsXYFHt/YGs PHusR4lxKGn03xb831m7G36mremKV6ma9dqgnSEQfsQn68UDhWJQNU9G3pD7cNWl mKpVPzsaEHAm1FpiDI50bKTFhw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</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" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/atlases.muni.cz.xml b/swamid-interfederations-1.0/atlases.muni.cz.xml
new file mode 100644
index 00000000..a385fe38
--- /dev/null
+++ b/swamid-interfederations-1.0/atlases.muni.cz.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://atlases.muni.cz/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
+      <md:ServiceName xml:lang="da">Patologi-atlasser</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: (1) Dermatopathology, (2) Fetal and Neonatal Pathology, (3) Pathology for Pre-graduate Students of Medicine. The atlases may serve as sources of teaching material for pre-graduate as well as postgraduate students of pathology</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: (1) Dermato-patologi, (2) Foster- og neonatal patologi, (3) Patologi for medicinstuderende. Atlasserne kan bruges som undervisningsmateriale for patologistuderende</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml
new file mode 100644
index 00000000..57049cf8
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-06-15T15:37:00Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">University College Sjælland</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University College Zealand</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
+c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9zc28udWNzai5kazo0NDMvaWRwMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAUi0p8JyqivUpFfLdlC7DAs632iyAuaDDhB6EH
+Nk4x0NuC3momEkYPGt8cWq/+GvarQgkTKJLyDKEvnrRLi825W7QqgNHhvIcm3Kr9
+5p9wEUnQguVHD0Q+xrNNECB6cPZQ/I9tv2wnZkOvrLBrwbGvHLo+Gb5X7ThT2UFU
+S3/Subgs17TezQcYm9VW7e0nZrFaz7iXFgVkpMmGh3/evEC0t/bcCVg67jvYNQPB
+6pnMkUCIbsEJEu71NA31H6qLyP+C5TLNACH3tszaQiQAgNoVJN7nbaqokdSyPOS+
+TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
+c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9zc28udWNzai5kazo0NDMvaWRwMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAUi0p8JyqivUpFfLdlC7DAs632iyAuaDDhB6EH
+Nk4x0NuC3momEkYPGt8cWq/+GvarQgkTKJLyDKEvnrRLi825W7QqgNHhvIcm3Kr9
+5p9wEUnQguVHD0Q+xrNNECB6cPZQ/I9tv2wnZkOvrLBrwbGvHLo+Gb5X7ThT2UFU
+S3/Subgs17TezQcYm9VW7e0nZrFaz7iXFgVkpMmGh3/evEC0t/bcCVg67jvYNQPB
+6pnMkUCIbsEJEu71NA31H6qLyP+C5TLNACH3tszaQiQAgNoVJN7nbaqokdSyPOS+
+TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp/SSORedirect/metaAlias/idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">University College Sjælland</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University College Zealand</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">University College Sjælland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University College Zealand</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://ucsj.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://ucsj.dk/english/frontpage</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml
new file mode 100644
index 00000000..d7861d9e
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fob">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-12T13:50:45Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Folketingets Ombudsmand. Biblioteket</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Library of the Danish Parliamentary Ombudsman</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvZm9iMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZm9iMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAze+SA7oU8EpDa4MUubLWvN5WRQyQfy3Kv7Few
+5Xn9VKJUh8dXkv031NaLIaV82J9fNG2LA7U+gnaXL/gkxqzWWQnPbAPF2+Pg8aEB
+2tDk41uVZRo72gLv/GTW0b9oWUWEUrLz4wBkAt1UC9lLpI3dsjv94NxxYcwPhE4a
+dTF5K+xGGASC8ynN3dxgtfOH1JMss0SpBFvxMgsR83iX2H9UC5N/9xyqqWo5+Aeg
+rU0vqrlxGqcfFIdcvPsFCIgLi+LgTyBn4BqcvfPCFIiBjesKiNUQydB/CBgzR1Vp
+DJCIsgurQPbiPy4OZVRBlbqofh1Xo0aluLUfIozsPMLTxCsT
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvZm9iMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZm9iMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAze+SA7oU8EpDa4MUubLWvN5WRQyQfy3Kv7Few
+5Xn9VKJUh8dXkv031NaLIaV82J9fNG2LA7U+gnaXL/gkxqzWWQnPbAPF2+Pg8aEB
+2tDk41uVZRo72gLv/GTW0b9oWUWEUrLz4wBkAt1UC9lLpI3dsjv94NxxYcwPhE4a
+dTF5K+xGGASC8ynN3dxgtfOH1JMss0SpBFvxMgsR83iX2H9UC5N/9xyqqWo5+Aeg
+rU0vqrlxGqcfFIdcvPsFCIgLi+LgTyBn4BqcvfPCFIiBjesKiNUQydB/CBgzR1Vp
+DJCIsgurQPbiPy4OZVRBlbqofh1Xo0aluLUfIozsPMLTxCsT
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fob/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Folketingets Ombudsmand. Biblioteket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Library of the Danish Parliamentary Ombudsman</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Folketingets Ombudsmand. Biblioteket</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Parliamentary Ombudsman</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.ombudsmanden.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://en.ombudsmanden.dk</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml
new file mode 100644
index 00000000..c628ecca
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kuc">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-12T14:01:25Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">kuc.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Kriminalforsorgens Bibliotek</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Library of the Danish Prison and Probation Service</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsva3VjMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VjMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQBVZ33y1Q12dx7V9Ctnl+h/gYtyqE5IPs9ZNz3m
+18RjQqgZluwu/S+wpJkgp9PI6sIPvA9QyINjz0ll6XUFwMmXRzktWLosrg+pzjwB
+xQG6jwAcsrXCppVuAMhINyraZYo5XVJIguCpMZUSxgNBbw1GTCS/ItDIVHF76PR5
+PdyCOaBHyXkBG6ZkytjLeNRI/PZe3GVQeYZk8T81esqHLF0sFmaNBYW7NeATshWl
+ekUlu0xXoVHCoAEpoQofczXG0pWbeSud76QE7eMnpqZuIRETqYzypKG8DXZ9iLAP
+wx3ILKsRxX3HT3RZZ2w2ZNeCWgOy8lFmuFDuPi7SqmPeiZQg
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsva3VjMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VjMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQBVZ33y1Q12dx7V9Ctnl+h/gYtyqE5IPs9ZNz3m
+18RjQqgZluwu/S+wpJkgp9PI6sIPvA9QyINjz0ll6XUFwMmXRzktWLosrg+pzjwB
+xQG6jwAcsrXCppVuAMhINyraZYo5XVJIguCpMZUSxgNBbw1GTCS/ItDIVHF76PR5
+PdyCOaBHyXkBG6ZkytjLeNRI/PZe3GVQeYZk8T81esqHLF0sFmaNBYW7NeATshWl
+ekUlu0xXoVHCoAEpoQofczXG0pWbeSud76QE7eMnpqZuIRETqYzypKG8DXZ9iLAP
+wx3ILKsRxX3HT3RZZ2w2ZNeCWgOy8lFmuFDuPi7SqmPeiZQg
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kuc/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Kriminalforsorgens Bibliotek</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Library of the Danish Prison and Probation Service</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Kriminalforsorgens Bibliotek</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Prison and Probation Service</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.kriminalforsorgen.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kriminalforsorgen.dk/Default.aspx?ID=29</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml
new file mode 100644
index 00000000..cf7d11ef
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kul">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-12T14:02:40Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Kulturstyrelsen. Biblioteket</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Library of the Danish Agency for Culture</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsva3VsMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VsMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAmT9xTVhUfmZW0irrRTmOCXd/ZfQNA5rRh2EUH
+NUDz/dVWJFVBbIiJJdcJ227FCUiBFpHpkZqugc9z/KCME79eIeCsvw+MUOuWvIcx
+njqWqDPqpawVNDGQAvSrFOuc/PIhJ0daoNZ2twbNHgECf9KcKYjmklfQ+0hq8+Jn
+8M+jgUVQoD80slfJ2W9GoAvSsr/R7dhxhNLb9h16u0n7h2Z+HsTC5nAa+4PBnJ1b
+OlI3UhyhPk2x2C/jfkY/NpMFlUdtXzZsolIcvMUhc66cncnQMBwervNkuRW5PFLK
+FUPBQzMww9IzEGgx1VLyFX/vrBodLFT6VMfFsaABZzcLPclk
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsva3VsMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VsMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQAmT9xTVhUfmZW0irrRTmOCXd/ZfQNA5rRh2EUH
+NUDz/dVWJFVBbIiJJdcJ227FCUiBFpHpkZqugc9z/KCME79eIeCsvw+MUOuWvIcx
+njqWqDPqpawVNDGQAvSrFOuc/PIhJ0daoNZ2twbNHgECf9KcKYjmklfQ+0hq8+Jn
+8M+jgUVQoD80slfJ2W9GoAvSsr/R7dhxhNLb9h16u0n7h2Z+HsTC5nAa+4PBnJ1b
+OlI3UhyhPk2x2C/jfkY/NpMFlUdtXzZsolIcvMUhc66cncnQMBwervNkuRW5PFLK
+FUPBQzMww9IzEGgx1VLyFX/vrBodLFT6VMfFsaABZzcLPclk
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kul/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Kulturstyrelsen. Biblioteket</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Library of the Danish Agency for Culture</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Kulturstyrelsen. Biblioteket</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Agency for Culture</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.kulturstyrelsen.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.kulturstyrelsen.dk/english</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml
new file mode 100644
index 00000000..b2b433fb
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/stm">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-12T14:16:43Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Statsministeriets Bibliotek</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Library of the Prime Minister's Office</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvc3RtMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvc3RtMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQALZZBi43JwZCt0Vh89YrEExI0hJluqx1H81WUK
+kbToo+Dk54izkEzcF4cmRdwUov2bQLyOKGjqfDM17QZyvef2hpVavjmAMmjiI90T
+nq7rADYwmlaXoBh+c+uAeclPoPV+mgFNJy9hJz4AKNEHlLpsTZ6O/FLKOreWtc7+
+8USHWoF7L/myhqW7tPwxYjcqYIEA0QWq2wNITxz1TtEQZdMsewjJZ6Ly317Akm7s
+RYXqSatTRmS+50JS5sOOGrDn1LZTtmNb/ARJW2UecS1hAVj1Kzmv7UoE4aMtEFJ+
+vwoHXocxBXIMwtAIJbGJw5LvJlrf6ZuMSBzM++OeBl/G0omH
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvc3RtMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvc3RtMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQALZZBi43JwZCt0Vh89YrEExI0hJluqx1H81WUK
+kbToo+Dk54izkEzcF4cmRdwUov2bQLyOKGjqfDM17QZyvef2hpVavjmAMmjiI90T
+nq7rADYwmlaXoBh+c+uAeclPoPV+mgFNJy9hJz4AKNEHlLpsTZ6O/FLKOreWtc7+
+8USHWoF7L/myhqW7tPwxYjcqYIEA0QWq2wNITxz1TtEQZdMsewjJZ6Ly317Akm7s
+RYXqSatTRmS+50JS5sOOGrDn1LZTtmNb/ARJW2UecS1hAVj1Kzmv7UoE4aMtEFJ+
+vwoHXocxBXIMwtAIJbGJw5LvJlrf6ZuMSBzM++OeBl/G0omH
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.minibib.dk/stm/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Statsministeriets Bibliotek</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Library of the Prime Minister's Office</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Statsministeriets Bibliotek</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Library of the Prime Minister's Office</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.stm.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.stm.dk/_a_1644.html</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml
new file mode 100644
index 00000000..a9282862
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/vej">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-12T14:18:32Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Vejsektorens Fagbibliotek</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Library of the Danish Road Directorate</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvdmVqMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvdmVqMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQCy7UIjtVe+m+SlFfA5Z6gKCbG53G9mgWg8qJu3
+u3GCP+RsqUQcTNSDTpKi6XVoGNTVyP0hkgIDrZrkEg7MAgrckuypDNB1vxfpoLcE
+krXesAnfI+ZjhwXWciXD6rbv4k7Md2n1G13fuWX3fCoEKvRXbHv03Iy+X/EdK2R8
+XIafxELnoUzfs/L58Fv5tACazZ2Rdhezm2Kn/N0mhy65XPs0AoDvawddzJ4fnAut
+Qrv2PFKrbnx82aJc/Vs6FN+CWieniunB38qijlLkPZS/aZ5G27MY/shUTDEgqCiW
+FKquxnI/YSS3DklR9MtcwmFKYX8V+uQ7Jlsu/1r8rHVncASj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
+YXlmLm1pbmliaWIuZGsvdmVqMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
+OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvdmVqMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
+0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
+n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
+WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
+ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
+xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
+MA0GCSqGSIb3DQEBCwUAA4IBAQCy7UIjtVe+m+SlFfA5Z6gKCbG53G9mgWg8qJu3
+u3GCP+RsqUQcTNSDTpKi6XVoGNTVyP0hkgIDrZrkEg7MAgrckuypDNB1vxfpoLcE
+krXesAnfI+ZjhwXWciXD6rbv4k7Md2n1G13fuWX3fCoEKvRXbHv03Iy+X/EdK2R8
+XIafxELnoUzfs/L58Fv5tACazZ2Rdhezm2Kn/N0mhy65XPs0AoDvawddzJ4fnAut
+Qrv2PFKrbnx82aJc/Vs6FN+CWieniunB38qijlLkPZS/aZ5G27MY/shUTDEgqCiW
+FKquxnI/YSS3DklR9MtcwmFKYX8V+uQ7Jlsu/1r8rHVncASj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.minibib.dk/vej/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Vejsektorens Fagbibliotek</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Library of the Danish Road Directorate</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Vejsektorens Fagbibliotek</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Road Directorate</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.vejdirektoratet.dk/publikationer.asp?page=document&amp;objno=63466</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.vejdirektoratet.dk/roaddirectorate.asp?page=dept&amp;objno=1024</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php?unit=gg.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php?unit=gg.xml
new file mode 100644
index 00000000..81cb9942
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php?unit=gg.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/gg/saml2/idp/metadata.php?unit=gg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:41Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Grenaa Gymnasium</mdui:Description>
+        <mdui:Description xml:lang="en">Grenaa Gymnasium</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Grenaa Gymnasium</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Grenaa Gymnasium</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PWdnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PWdnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBMXkp3
+c1jLj0QNJYll4rzdfhyge7aut2vSTofZKZmd42aykUfPhQeJFyHGSkCNXE965QWw
+SJTvUUNaM3FZjae3TFY+o4lgF3KBkXGDV0nwH+IjzfJ89Cw7iCZ9NUYBsRuCRUIq
+zkJZODS1hgC75W28KoCKOiWmKN7v4+zyDk52aNm1jELnvHgmXfT6Ga7/GI+uusk3
+sxC5f4fnXJXaGsh7mXnW4r3JZkDFmHbaiqim80NgEDzlMgI9kb64p1mhM/vAMPu/
+1xqhR3VmCahpI8n6vII6+g07qhfc8GLzJ0jUaMyQoucpN4LwfIshLtBdOn9MCFVe
+Z8bY2QouT70h3w+L
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PWdnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PWdnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBMXkp3
+c1jLj0QNJYll4rzdfhyge7aut2vSTofZKZmd42aykUfPhQeJFyHGSkCNXE965QWw
+SJTvUUNaM3FZjae3TFY+o4lgF3KBkXGDV0nwH+IjzfJ89Cw7iCZ9NUYBsRuCRUIq
+zkJZODS1hgC75W28KoCKOiWmKN7v4+zyDk52aNm1jELnvHgmXfT6Ga7/GI+uusk3
+sxC5f4fnXJXaGsh7mXnW4r3JZkDFmHbaiqim80NgEDzlMgI9kb64p1mhM/vAMPu/
+1xqhR3VmCahpI8n6vII6+g07qhfc8GLzJ0jUaMyQoucpN4LwfIshLtBdOn9MCFVe
+Z8bY2QouT70h3w+L
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/gg/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Grenaa Gymnasium</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Grenaa Gymnasium</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Grenaa Gymnasium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Grenaa Gymnasium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.grenaa-gym.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.grenaa-gym.dk/home.aspx</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php?unit=lg.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php?unit=lg.xml
new file mode 100644
index 00000000..effe9763
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php?unit=lg.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/lg/saml2/idp/metadata.php?unit=lg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:41Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Langkær Gymnasium og HF</mdui:Description>
+        <mdui:Description xml:lang="en">Langkær Gymnasium and Higher Prep Exam</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Langkær Gymnasium og HF</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PWxnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PWxnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCQgrdi
+MuF4a8PYnhGvJLUh5wFA7kE3ZM5w2PXF/xP3Hj4Co97GzIpaUn3GXLQCYSMAod+e
+ntvU9o/aGaOUDfgx98mMz0Y1Bs2xYDN15vDpslvEZovDnRC/uiG7DNyTfsLXv7WF
+SYcYief9H99UVX8SU/yg94+7car0od8n3F4D9E7qG/8aV8Jqknpqf/XqQO5AaYEz
+JDG7def9y3PADgtSKSPFLt3lWiA7J5lz4CD6V8IUHoaPKkF7CATsg+jGsXjvYAVk
+h/GubE2eBw1Z4u2o/OPHxABwi1+uRQAp6Yn7Si+h6Or8PwaLyKiIKhUI1o274Bo6
+K8W4L1OpUExnZWlW
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PWxnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PWxnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCQgrdi
+MuF4a8PYnhGvJLUh5wFA7kE3ZM5w2PXF/xP3Hj4Co97GzIpaUn3GXLQCYSMAod+e
+ntvU9o/aGaOUDfgx98mMz0Y1Bs2xYDN15vDpslvEZovDnRC/uiG7DNyTfsLXv7WF
+SYcYief9H99UVX8SU/yg94+7car0od8n3F4D9E7qG/8aV8Jqknpqf/XqQO5AaYEz
+JDG7def9y3PADgtSKSPFLt3lWiA7J5lz4CD6V8IUHoaPKkF7CATsg+jGsXjvYAVk
+h/GubE2eBw1Z4u2o/OPHxABwi1+uRQAp6Yn7Si+h6Or8PwaLyKiIKhUI1o274Bo6
+K8W4L1OpUExnZWlW
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/lg/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Langkær Gymnasium og HF</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Langkær Gymnasium og HF</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www2.langkaer.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www2.langkaer.dk/omskolen/internationaltsamarbejde/englishwebsite</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php?unit=sg.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php?unit=sg.xml
new file mode 100644
index 00000000..14b50135
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php?unit=sg.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sg/saml2/idp/metadata.php?unit=sg">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:43Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Skanderborg Gymnasium</mdui:Description>
+        <mdui:Description xml:lang="en">Skanderborg Gymnasium</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Skanderborg Gymnasium</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Skanderborg Gymnasium</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PXNnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PXNnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBYtW2l
+iYMl6wnN6xr5ohLxSJKuhiPoURzKfW77tFO24Mjf6f6WYhbNAxCD8cTXcDONb4lS
+VTx1abxwKra+L3SsnmSShzDZpIzarfI+kAWug4ucwc8I9dlF8HqImE0inPiRE8UQ
+H80pPuAcCspIwWkZ//Gmhkb3NoEeuvvncskcSd2cEKJQ442+Vnxhh+9vSpHHF3/e
+PyPmsu7gFLZVjvr2IyOWS7ff70SUcY9eeB6qTOkB8oVyRHh6s4yLOaddamu2F9AH
+YtCKmmWpzIjRGtZ6vnPw3iBhzsucboJubxrL6gAuDECh10VGBkfB8HAK4OlNUEVB
+YrENDJLWYDq2kxUH
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
+bml0PXNnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
+Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21l
+dGFkYXRhLnBocD91bml0PXNnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
+dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
+55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
+k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
+lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
++No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBYtW2l
+iYMl6wnN6xr5ohLxSJKuhiPoURzKfW77tFO24Mjf6f6WYhbNAxCD8cTXcDONb4lS
+VTx1abxwKra+L3SsnmSShzDZpIzarfI+kAWug4ucwc8I9dlF8HqImE0inPiRE8UQ
+H80pPuAcCspIwWkZ//Gmhkb3NoEeuvvncskcSd2cEKJQ442+Vnxhh+9vSpHHF3/e
+PyPmsu7gFLZVjvr2IyOWS7ff70SUcY9eeB6qTOkB8oVyRHh6s4yLOaddamu2F9AH
+YtCKmmWpzIjRGtZ6vnPw3iBhzsucboJubxrL6gAuDECh10VGBkfB8HAK4OlNUEVB
+YrENDJLWYDq2kxUH
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sg/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Skanderborg Gymnasium</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Skanderborg Gymnasium</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Skanderborg Gymnasium</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Skanderborg Gymnasium</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.skanderborg-gym.dk/da</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.skanderborg-gym.dk/en</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php?unit=sss.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php?unit=sss.xml
new file mode 100644
index 00000000..65cb277f
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php?unit=sss.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sss/saml2/idp/metadata.php?unit=sss">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:44Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Social- og Sundhedsskolen i Silkeborg</mdui:Description>
+        <mdui:Description xml:lang="en">Basic Health Care College Silkeborg</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Social- og Sundhedsskolen i Silkeborg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Basic Health Care College Silkeborg</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvc3NzL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
+dW5pdD1zc3MwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBMMUowSAYD
+VQQDDEFodHRwczovL3dheWYuc3VwcG9ydGNlbnRlci5kay9zc3Mvc2FtbDIvaWRw
+L21ldGFkYXRhLnBocD91bml0PXNzczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+jP2/I0Mu2SqJ93nB4rXgdV5mSzWsFB4q7bkfA1Ra7XYzfSpGOvMHcqaaKcAchA1O
+yfx9LLQMEEBwHkR7pYk7LtaMcvkNVHkIJE7dtkhA2jDXzagwBAWqu8sYTxDjNjDJ
+7aZ+zaVDTBlH0rTmv4Vv2Qtyuw1KhOdYwGIcyHj59TYIVXXsPkGdpjZ6E9A+oN+m
+yXhtHaPq2WoDER6YZ1zcW2kp0iXpVku3TQo4oQhV65uC37g0748riJRED3HuCw+R
+SASmcxjMh0wZ/egIWQ4X3KUVvSPR+A5TJ5uS4KsccZMTb1ICyaUs7skEEWHkbPxO
+Z0FIk7cDlCfAO6WS9Da4VQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
+YXlmLnN1cHBvcnRjZW50ZXIuZGsvc3NzL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
+dW5pdD1zc3MwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBMMUowSAYD
+VQQDDEFodHRwczovL3dheWYuc3VwcG9ydGNlbnRlci5kay9zc3Mvc2FtbDIvaWRw
+L21ldGFkYXRhLnBocD91bml0PXNzczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
+jP2/I0Mu2SqJ93nB4rXgdV5mSzWsFB4q7bkfA1Ra7XYzfSpGOvMHcqaaKcAchA1O
+yfx9LLQMEEBwHkR7pYk7LtaMcvkNVHkIJE7dtkhA2jDXzagwBAWqu8sYTxDjNjDJ
+7aZ+zaVDTBlH0rTmv4Vv2Qtyuw1KhOdYwGIcyHj59TYIVXXsPkGdpjZ6E9A+oN+m
+yXhtHaPq2WoDER6YZ1zcW2kp0iXpVku3TQo4oQhV65uC37g0748riJRED3HuCw+R
+SASmcxjMh0wZ/egIWQ4X3KUVvSPR+A5TJ5uS4KsccZMTb1ICyaUs7skEEWHkbPxO
+Z0FIk7cDlCfAO6WS9Da4VQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sss/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Social- og Sundhedsskolen i Silkeborg</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Basic Health Care College Silkeborg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Social- og Sundhedsskolen i Silkeborg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Basic Health Care College Silkeborg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.sosusilkeborg.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.sosusilkeborg.dk/?224</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/bridge.uninett.no.xml b/swamid-interfederations-1.0/bridge.uninett.no.xml
new file mode 100644
index 00000000..bb6ff7af
--- /dev/null
+++ b/swamid-interfederations-1.0/bridge.uninett.no.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://bridge.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://bridge.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="http://bridge.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Feide DiscoJuice Kalmar Showcase Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A service that allows users to verify that Kalmar login works to norwegian services connected to Feide. This service also showcases the DiscoJuice IdP Discovery Service.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/connect.tut.fi.xml b/swamid-interfederations-1.0/connect.tut.fi.xml
new file mode 100644
index 00000000..e3db269a
--- /dev/null
+++ b/swamid-interfederations-1.0/connect.tut.fi.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ao4.ee.tut.fi/Shibboleth.sso/DS" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
+VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
+VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMV
+SHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+X
+XOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U
+9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQ
+Im4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GB
+Uwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfD
+cAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwID
+AQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
+VR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNV
+HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
+ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
+BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgG
+A1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBC
+vOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwj
+Zagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26
+B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVS
+vUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23r
+z+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1
+YUyAsGo8rZZF7VE=</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://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
+      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Pasi</md:GivenName>
+    <md:SurName>Hakkinen</md:SurName>
+    <md:EmailAddress>pasi.hakkinen@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/core.uwap.org.xml b/swamid-interfederations-1.0/core.uwap.org.xml
new file mode 100644
index 00000000..ac7aacde
--- /dev/null
+++ b/swamid-interfederations-1.0/core.uwap.org.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UWAP</md:ServiceName>
+      <md:ServiceName xml:lang="no">UWAP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Åkre Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/dev.wiseflow.dk.xml b/swamid-interfederations-1.0/dev.wiseflow.dk.xml
new file mode 100644
index 00000000..e52a0d04
--- /dev/null
+++ b/swamid-interfederations-1.0/dev.wiseflow.dk.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.wiseflow.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-12-19T20:51:32Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WISEflow dev</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow dev</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">WISEflow dev</md:ServiceName>
+      <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/elegitimation2.inloggning.se.xml b/swamid-interfederations-1.0/elegitimation2.inloggning.se.xml
new file mode 100644
index 00000000..a4f7657e
--- /dev/null
+++ b/swamid-interfederations-1.0/elegitimation2.inloggning.se.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/discoresp.php"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-logout.php/virtual_sp_for_swamid_uu"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Svensk e-identitet AB via UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Svensk e-identitet AB via UU</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mikael</md:GivenName>
+    <md:SurName>Westoo</md:SurName>
+    <md:EmailAddress>mikael.westoo@e-identitet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/foodl.org.xml b/swamid-interfederations-1.0/foodl.org.xml
new file mode 100644
index 00000000..91edbfcc
--- /dev/null
+++ b/swamid-interfederations-1.0/foodl.org.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi.xml b/swamid-interfederations-1.0/fse.eduuni.fi.xml
new file mode 100644
index 00000000..40e8b13c
--- /dev/null
+++ b/swamid-interfederations-1.0/fse.eduuni.fi.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Eduuni-työtilat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eduuni-workspaces</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Eduuni-työtilat on opetus- ja kulttuuriministeriön toimialan yhteinen sähköisen työskentelyn ja verkostoitumisen alusta.</mdui:Description>
+        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
+BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
+UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
+HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
+VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
+bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
+2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
+B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
+2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
+NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
+HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
+AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
+b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
+ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
+CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
+cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
+HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
+cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
+ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
+ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
+JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
+JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
+R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
+FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
+f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
+e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
+An5aXL3c9Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Eduuni-tyotilat</md:ServiceName>
+      <md:ServiceName xml:lang="en">Eduuni-workspaces</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Eduuni-tyotilat on opetus- ja kulttuuriministerion toimialan yhteinen sahkoisen tyoskentelyn ja verkostoitumisen alusta.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Saarikoski</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Toni</md:GivenName>
+    <md:SurName>Sormunen</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/haka.saimia.fi.xml b/swamid-interfederations-1.0/haka.saimia.fi.xml
new file mode 100644
index 00000000..4fd30a12
--- /dev/null
+++ b/swamid-interfederations-1.0/haka.saimia.fi.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://haka.saimia.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
+OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
+KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
+DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
+sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
+BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
+ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
+MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
+9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
+1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
+0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
+E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
+2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
+PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
+OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
+KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
+DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
+sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
+BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
+ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
+MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
+9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
+1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
+0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
+E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
+2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
+PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ilpo</md:GivenName>
+    <md:SurName>Olkkonen</md:SurName>
+    <md:EmailAddress>mailto:ilpo.olkkonen@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Saimaan amk</md:GivenName>
+    <md:SurName>IT-palvelut</md:SurName>
+    <md:EmailAddress>mailto:haka-admin@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Saimaan amk</md:GivenName>
+    <md:SurName>IT-palvelut</md:SurName>
+    <md:EmailAddress>mailto:haka@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.aalto.fi.xml b/swamid-interfederations-1.0/idp.aalto.fi.xml
new file mode 100644
index 00000000..09d7ec24
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.aalto.fi.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
+ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjQ14Y5ls9qgndtooF
+Z9tekHhuETMtovhozaCqvm6HwVE+jEo9ik4zwre42zTGz2QACBOldN5RlFw/A3kJ
+oGK5jEqQZFIw2XG22C+A7NNoZLqgGH7K3BYlYpI1Vpqpx+tk2/QpVUi4JqdIfVxT
+KHQZIW66dV4Zz+JMlAiPR/qzjLBYwUBllE5GG/BMBo7fQvMKqfrdAi3QcPdsiAQG
+Hl39WcchL53Y2tN8xOq2bkk6XOELBEe6byYdVgRzsGi6eyQHPvcWGb/Fl2JPahUj
+WM8Zz1w077omI4tzq/OLhnKAB/J25m9SAh23rq/lCFrnle528tE/nRBqX/yop8Hh
+n++dAgMBAAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQU7fL+WKGykn8q5Nden977Qx3neOEwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5hYWx0by5maTANBgkqhkiG9w0B
+AQUFAAOCAQEAMqh4jbB8O648lGCpqemnz15SXeHGdQAyfvC3xDwEVa7eplPzeSg1
+XW1MqufDwc6j7nO5fYtULdMuj7/GM9gXkiU2Zv+qPbymrdADan8zqHQ65Ph+JarH
+U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
+Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
+Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
+ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mika</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.abo.fi.xml b/swamid-interfederations-1.0/idp.abo.fi.xml
new file mode 100644
index 00000000..c373b984
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.abo.fi.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.abo.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA0MDUwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMDgxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmFiby5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5UWgT90vXzUDlkapH5
+CVGFvoVgNDWxVr7WhrH+z2moP5h1wkK/Dnr0CKsglVyNkHycNkLmNH/9CVynp6LN
+sl+CEli5BmskLGNAvc+Q9bQwV52OJZQnXeCDDYSwSgDiIgrrml8niocBehGJEORC
+KW51UErjEf6U//1VfW1vG2r3BydjqM7pqs2GZx9p/US7F6lds8La1Vf/jp1ErW6G
+g1TzHYkx56EYNpqjo2Uin2vHowhidM37grjJQJ+q2qb7JsS4t074EwEQA0fF4wKa
+Yv6coSZyOpPXuuDLDlp3/dfY+beqR2oRml3HMvPnSp8+x/4y3/zEkcXcksmlwVCG
+LBUCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBT6OoUGpLGH7zyiXK+pmGrcVKeRnDAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmFiby5maTANBgkqhkiG9w0BAQUF
+AAOCAQEABsw3n2IGqqaYTvw7lHIvQzk6FmF3TqhJIV3SZv6Pm/sY1gY/RAykgGkM
+Sggdizdzf7LdaKaJRLOkUjj+za2zCGIE2n75XQBG4Qh+fcSfUFyCOdelGAOsoUDX
+nm7SpO8lLINjKr28Z7ll70fYUUvuwntEfYVcWtiZ/dicL8GWrcewROGGMDuKynKy
+UpUufLIUdgHlejsfRYwsV+rOMlDnzI4Mgw06fqiILAHhW1sGAD6yQ6FX2zOR5oVU
+4jIupvZYa1oNsIp/M5Ks7/uTY9T0cOYFlQaesTr6Mb18BK/lhvZ8hUblemAxM5DJ
+eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dennis</md:GivenName>
+    <md:SurName>Holtlund</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
new file mode 100644
index 00000000..d75aeb63
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
+        <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>csc.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDgxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmNzYy5m
+aTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALxQbKAbjH1Y6nXZLERE
++8+VuH3w0K/FXMG3K0ySP36uU5QylaFDTx++DZT+IlEwuEXEHoW673P1ymL/Gg1j
++SlZdBxH6fFOqSLaT1jFtrpWleIwTWJtupwbB+GVNaPCFvo0snB0u4x1czcisFvG
+kc+GTN99e7dcuLA2kaQsVtoH9BLY99rubto6jbPdAb98htm+1a4yBZ/k3cirpDLo
+TZn2ILV/wEnsU/CdELweBm+3Ws6RcneqS6q+iNX6arA3+/eskksqbvd0PbbWHVl1
+b3r21T82lo+V6AdxBEKyZvlrxek8T8/m15AIAy6Id4GC/dc2crMFfrQV0hjXl//M
+ssOzUnbf5gJsX1ZHg8XrdEb60cssI0kriOOjDahYOCfP7nYYC26XzTrwfqQuQv/s
+3ZADXmQeLcMG42U2iBJaeXoqS1GymnToX08hx/UxabLSi+Hd2xOkurddq7A9x+Y7
+43q/6wKLoByNyFdyDVe+Tczap6vySov/WF5NgSn6mHfiC+EOHDhLQsRISyCTYWh/
+nmECl7nwaslnKfotwh+ax5EIlOF89dWOYgQk99ry6p8PrnJciHp5YsQGFi2uahwX
+Wy0Q0GWwPluh9QPRyV2Msk/xKYfkQV+JGk6jrES+6kHMI3xj6kf47u1jn8hSZmVR
+EbJgpgP8VadStP6zCWMBWbTdAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUT4gxrqHsUIEm8Q6JLQ79lpx1VrIw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMHgGA1UdEQRxMG+CCmlkcC5jc2Mu
+ZmmCEWhha2EtaWRwMDEuY3NjLmZpghFoYWthLWlkcDAyLmNzYy5maYIRaGFrYS1p
+ZHAwMy5jc2MuZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpggxpZHAwMy5j
+c2MuZmkwDQYJKoZIhvcNAQEFBQADggEBAHLHoTcTEV6UgJ/RvzuRuQJlcxEURYzs
+Vg5WroFJYpGUa3OPHqHdWWJIAYWjE21oRKoxrOigpr/Ux24AP7z6OEh/ACUtrT86
+nwl2FZsWJOQ/7kkplDs3Yjy+7kkQyUVZoiPcNVE9nRVJuX0J2pwq29dkDibgTiv1
+QsoRrRYbh+Ocsi72e5feCe/vY9ZjnwKQmfQsDmzU72PwaJ5AwHh2bHE+9Eoj7AiN
+OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
+yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 658df086..e7b15bb0 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -67,6 +67,7 @@
       <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ekrehagen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
@@ -358,6 +359,7 @@
       <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sigdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sintef.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">siu.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.ids-mannheim.de.xml b/swamid-interfederations-1.0/idp.ids-mannheim.de.xml
new file mode 100644
index 00000000..8e44ef54
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.ids-mannheim.de.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ids-mannheim.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <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>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Institut für Deutsche Sprache - Test SP</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institut für Deutsche Sprache - Test SP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Interface to the Corpus Search, Management and Analysis System COSMAS-II, which offers various possibilities to access the German Reference Corpus DeReKo and other corpora hosted at the IDS. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Schonefeld</md:SurName>
+    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.it.helsinki.fi.xml b/swamid-interfederations-1.0/idp.it.helsinki.fi.xml
new file mode 100644
index 00000000..cbd09b15
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.it.helsinki.fi.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
+c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
+srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
+V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
+QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
+hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
+0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
+IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
+aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
+56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
+S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
+S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
+3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
+tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.helsinki.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
+c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
+srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
+V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
+QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
+hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
+0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
+IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
+aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
+56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
+S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
+S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
+3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
+tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Olli</md:GivenName>
+    <md:SurName>Saikko</md:SurName>
+    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Aarno</md:GivenName>
+    <md:SurName>Sandvik</md:SurName>
+    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
new file mode 100644
index 00000000..e1e1e9e7
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.lapinamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAPU41ovbqC7No8q/JafFb+0wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjMwMDAwMDBaFw0xNzAxMjIyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmxhcGlu
+YW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr050+KUHu9a+
+je75uUh/iQCBuoBdOtTRN5NHKK4cRKfM2+0+10zSvCxbcbul0T+yKbiHL5fVVOmm
+T3EZ0M0uInzjgICg63u5HmaF90DjFLpBtaZX/TTaWzvdFODFgqnZabyW/30ea7Zq
+5/8b0NK5Q/klEFYO4TIgkkBVwIlI6pGU/X9V596iEPHfyylR2dEIARviYTeqdQg3
+GVig/DngKBcan11pmEu3mhjVJl+yXRQeGhdeNXC7k8e3XMwEn/L2TEFy909qgHdT
+3Jm2y0g7SHzRoPt4UGJVx0t5dYFRPSEfJcxlP6/B5boU0RpYMa3AjBv7Nnk12+Ww
+vNQAf8Mt3wIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFBghh/DvfWtZXDg/l/liGeY0dFwlMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9pZHAubGFwaW5hbWsuZmkwDQYJ
+KoZIhvcNAQEFBQADggEBACI8smMl17k5l6eOmo1E9yZkF/QasMOd7NaiNT7Cmddt
+nAHtPG7nNFJX+Vj7aOhxZb6Dicp8aPueeswp1tX36PLj4QImXwLs/MoZ0DRUpsAI
+dqBucmey2exV/eIsfLoEOGnoe9aJJHbf1FS/0c4JR7PUfKShp7mYrROKmVZ+N/ya
+ohzJ/hrZTS8lhx46mWsy8WJoZyvV8SSU7SJTblRU1rbjhMIwXWGpAXgq69Oa72IY
+SUNstvZgVwotwKijIBs0iDamz8pzrMKBN1Qft+gzNRC19ijM3S+Ydrx23uBOJz9S
+iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lapinamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Markku</md:GivenName>
+    <md:SurName>Taipale</md:SurName>
+    <md:EmailAddress>mailto:markku.taipale@lapinamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Heikkila</md:SurName>
+    <md:EmailAddress>mailto:jukka.heikkila@lapinamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi.xml
new file mode 100644
index 00000000..840bd980
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.metropolia.fi.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.metropolia.fi/idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
+b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
+wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
+P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
+aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
+YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
+bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
+9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
+7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
+tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
+b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
+qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
+G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.metropolia.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.metropolia.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.metropolia.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
+b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
+wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
+P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
+aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
+YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
+bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
+9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
+7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
+tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
+b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
+qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
+G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.metropolia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.metropolia.fi/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.metropolia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.metropolia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.metropolia.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jani</md:GivenName>
+    <md:SurName>Kaljunen</md:SurName>
+    <md:EmailAddress>mailto:jani.kaljunen@metropolia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Veikkolainen</md:SurName>
+    <md:EmailAddress>mailto:jukka.veikkolainen@metropolia.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.oamk.fi.xml b/swamid-interfederations-1.0/idp.oamk.fi.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.oamk.fi.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
+BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
+MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
+ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
+9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
+ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
+H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
+qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
+gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
+j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
+A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
+LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
+aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
+AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
+T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
+K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
+Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
+Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.shh.fi.xml b/swamid-interfederations-1.0/idp.shh.fi.xml
new file mode 100644
index 00000000..4e0db6ad
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.shh.fi.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.shh.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">hanken.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQR1F2IKk/FGfCBPi7E7Lr9DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTAxODAwMDAwMFoXDTE2MTExMjIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuc2hoLmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0tjmJ1ERx/Za5uVfPURB
+8eTAKK0QEXJD/++dCZcVSrIpau8jiLkmi+kzweI531JVBDrpT24jFGXn2cKnzUIB
+xpOWEUKLQSkYdA3LoKD1gJjjFxF8Y3J237Zlg3QL/dmNnfCLxs8SsXbCsjxpuPAP
+wYRR1ZEL2SjdU3zEDc4iqMqkk5wS4lzjB1SMNFaaKRRsW97BAKATyHRwp4a01nB4
+o0MDNn4iGcIoE3kO9X83H7smurBXGqVzc4dnfH3yLOXF+NMpRbH9upSrSBe2EoZU
+jc+Vi4/fsEXRmr/u+8IOb1ERpYNLCd6L+mD9ppbA3ZeRJe/LRaq7MFQX3VzMR5mn
+xwIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFH9BqIu5UIBGpznMYuQP3dJQ6f7zMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBk7DXTXfwZCTrFUVB73h4TzHF2zrIUm83SFCNcn5BBA9qKRL/TfozD4ZwK
+1zfaVtcc8gpS4tUE+T3dOa2zKvUgYSuDScC7cInBht1wLUrukBhQCDIU+0lKaBJv
+A17KXHxowqua95sMKkN3tDUB7lbLCuPxhJyWzE2E9TrJ2oTYQ35C3cGd5FbnLEWk
+9ceS4WR5+t1lpvC4uwWrc0DYgb0ADv9TDW52/qssZKNLbVu5BwRKI6ToAZTgnNbf
+aeNbuslxAJn11gg6nMy8yRVZMTOMZoLK5j4vNXhp8YngrWxdGBDIaEtLvLWfIs99
+nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shh.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.hanken.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hanken.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.hanken.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kuno</md:GivenName>
+    <md:SurName>Ohrman</md:SurName>
+    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Isaksson</md:SurName>
+    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hanken</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:help@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.tut.fi.xml b/swamid-interfederations-1.0/idp.tut.fi.xml
new file mode 100644
index 00000000..8fe21a38
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.tut.fi.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.tut.fi/shibboleth2">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
+TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
+1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
+mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
+jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
+c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
+iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
+R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
+Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
+7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
+DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
+ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
+TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
+1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
+mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
+jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
+c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
+iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
+R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
+Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
+7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
+DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
+ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jussi</md:GivenName>
+    <md:SurName>Tirkkonen</md:SurName>
+    <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.uef.fi.xml b/swamid-interfederations-1.0/idp.uef.fi.xml
new file mode 100644
index 00000000..5c0771e6
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.uef.fi.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.uef.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
+MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
+biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
+QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
+MTIzWhcNMjkwNDA1MTQxMTIzWjBZMQswCQYDVQQGEwJGSTEmMCQGA1UECgwdVW5p
+dmVyc2l0eSBvZiBFYXN0ZXJuIEZpbmxhbmQxDTALBgNVBAsMBFRpa2UxEzARBgNV
+BAMMCmlkcC51ZWYuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
+JZ1AwVGJ2S7FOsjH/vsvo2SEsUwN9QFdz4Kf+QBR50NaOocbl6wV6spOt//d/Tbp
+M9qs4Z9EgfT8hvCjNLRhI4m8w6XhYlA/MmBcxgQBYn19xoUTJ3DcJJddLIQsMU2H
+qOKoiYWwLL1ZQgbFG5ilZ15ZWpUXRBdDt9Hn8eK2SF2dPNrUKuAOZyDkMSY9cfwR
+pWrSUwX7Mm9+8TceZHWHaoPR2nbBABqBNuhXvZl6yK+bGXFvbPNGbMJTwXY/LJvc
+4x+sSDuR7HM5tGFcwFjVfj2yEva9BwG8jXWB/RSj7eleHLLM7+PvvR5axVaPbQ/9
+CIJjgPh1r8P8arKs140LAgMBAAGjJjAkMCIGA1UdEQQbMBmCCmlkcC51ZWYuZmmC
+C2lkcDIudWVmLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQA9xGaMiAZM1Ivp3XcTeNn2
+2U/vcCD9fZ9FbrB9buJrECPFh31xJqCtY4gTqdJZl9Z9T3e3I8SqahRPdKX8QPed
+XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
+fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
+Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
+WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Markus</md:GivenName>
+    <md:SurName>Hagman</md:SurName>
+    <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.ulapland.fi.xml b/swamid-interfederations-1.0/idp.ulapland.fi.xml
new file mode 100644
index 00000000..2c4ebebd
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.ulapland.fi.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ulapland.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ulapland.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGrDCCBJSgAwIBAgIQdmrtc4rB3ElPE0L6/94NTjANBgkqhkiG9w0BAQUFADA5
+MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2Vy
+dmVyIENBIHYxMB4XDTE0MDQxNjEwMjQ0N1oXDTE2MDQxNTEwMjQ0N1owgYQxCzAJ
+BgNVBAYTAkZJMRAwDgYDVQQIDAdMYXBsYW5kMRIwEAYDVQQHDAlSb3ZhbmllbWkx
+HjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgTGFwbGFuZDEVMBMGA1UECwwMSUNUIFNl
+cnZpY2VzMRgwFgYDVQQDDA9pZHAudWxhcGxhbmQuZmkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDF4kd9ojVzXalhcDQm+DqVC9DAv+SNYCxSWnhbkms2
+8PPk5cMT6WfHy242QSKYZe2Asbvx856xCxbI+pkEtN7MyeDGu5PmFetwcSj5qaVG
+5spVNoZAgzLKWTzBfmxTT9EjhDioLV2ObqIzR+NTOCvQjfEGKpw9Lg9JobadmUwp
+kDhk1Y3o7ERBnOdyVFfvggl8sUMzU47XJfxk+jlpvOy7x3rQswTTOaGZkgd0OVxC
+awr6HzbBTEu08AiX2nsD3GnqSUPS38/K26a5KGOzFx7j+kT4K+ICBiPTFYgTKgln
+50rIwCn2wYf96vb/Vj6KT/S3WpQ6hVLMie5QA5Zuwl4rAgMBAAGjggJiMIICXjCB
+jQYIKwYBBQUHAQEEgYAwfjAtBggrBgEFBQcwAYYhaHR0cDovL29jc3AudHJ1c3Qu
+dGVsaWFzb25lcmEuY29tME0GCCsGAQUFBzAChkFodHRwOi8vcmVwb3NpdG9yeS50
+cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFzZXJ2ZXJjYXYxLmNlcjAf
+BgNVHSMEGDAWgBSggb5Vm/N/YQWEiy0MO+AISe5XPjAZBgNVHSAEEjAQMA4GDCsG
+AQQBgg8CAwEBDzCBygYDVR0fBIHCMIG/MEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1
+c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2MS5jcmwweaB3
+oHWGc2xkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20vY249VGVsaWFT
+b25lcmElMjBTZXJ2ZXIlMjBDQSUyMHYxLG89VGVsaWFTb25lcmE/Y2VydGlmaWNh
+dGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMA4GA1UdDwEB/wQEAwIEsDB4BgkqhkiG9w0BCQ8EazBpMA4GCCqGSIb3
+DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQB
+LTALBglghkgBZQMEAQIwCwYJYIZIAWUDBAEFMAcGBSsOAwIHMAoGCCqGSIb3DQMH
+MBoGA1UdEQQTMBGCD2lkcC51bGFwbGFuZC5maTANBgkqhkiG9w0BAQUFAAOCAgEA
+KrVSvHwBWFnLVT/pQoSRaNMTnMymhmYDM78Lo2PVXLEnfmuD8pZYXFTLGxRMDkM/
+bC8oGTXFKBmphr0wn2unD06itE+XBZXpQac+497q1Fb7/rgmf7Vp11Zq2m2yUnjm
+NaGIsjgP+K6Y1EmeAXicbMVHVjJ2MmBuwTRhZI5kOIktUWrHuthSQ3Vu78Urdirz
+fEC0lqokvJIABrQQf36sZc84p7oyrO7EWb2BePM3ZtNQwSpDATTdhDTTdVgETA6T
+JGOcnvlP6i2rVel18noDgvoUuPr8TKkeV5uyc0cF7nfLnqQpRiLrWnF1Eko0Ze3w
+QmGUdoWkB/RQ9BgJ3Bbfo+37EZg+VxXBCI0chCEXjFwMAurS4SzBYplZsBr7WxXH
+JsrHg0F9JQvo5wQ04sZuiMP3WQhVuTdvHay11pih6GY1ujlMMjlbqlg1SrCJ3tMi
+jwhCYD9uz2EVokoHVRBYfsr9iE9H/Fo9PXYIZJNRdpSQahLammOLqnhmhRGBMtg6
+6zHBsKhwIbmxyb2z8ri2J4bucZG0tLqw+5pm39zMjHpvjUJ49cNhVF8hH8Tsxglb
+WBUVl8rtnAcsFuvvT5nyxPRV6+2hromsdwEK4PeUyLz0BFxQM5U/J9KOhC1faVfM
+sNec1gZqKR5mpgC1RQRtCn3q7woBwcokimHhhsFgFu8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulapland.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lapin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Lapland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lapin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Lapland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ulapland.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Esa</md:GivenName>
+    <md:SurName>Matasaho</md:SurName>
+    <md:EmailAddress>mailto:esa.matasaho@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iikka</md:GivenName>
+    <md:SurName>Kupari</md:SurName>
+    <md:EmailAddress>mailto:iikka.kupari@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idpext.test.ek.sll.se.xml b/swamid-interfederations-1.0/idpext.test.ek.sll.se.xml
new file mode 100644
index 00000000..72ec8eee
--- /dev/null
+++ b/swamid-interfederations-1.0/idpext.test.ek.sll.se.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idpext.test.ek.sll.se/neas">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
+EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
+MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
+MTIxMjA2MDk0MDU4WhcNMTQxMjA2MDk0MDU4WjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
+Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
+CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
+eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
+/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
+m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
+DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
+MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
+P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
+MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAjr8rhk0FxZwSxZAGh916cwVEp9SDUcQcoPbY9TYbQe2XVMXBImNo
+PTkkbgFlxILxdq6ZOeKwsjTV4ON/jLVX/TJ9OzolKBfMpfLNf5DiBvG7BfSlbuTA/jEwC7qLHDmk
+3vC3gLSkWbE++2E2aOmKjDD7Rp7CSpHSM11FkF9CWdqAYV0f3YcCHQMEadOGNDeXRWhJH9e/ejT1
+BKtI7OLnXC7ceugbqIjbZANpiNT9YHtZcCtKU9C4iV6G4OEK0+Y9Pr5RS2gULAyDDYR3BzUOcZTI
+yaELvrGIDisdW7WILf3THNVuigw03ZuLjxql/Wo59WtttVngV+LrAs+UeQq9JA==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>5abdb300f7ff38ef47e4966bd82dd209c7eef117</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpext.test.ek.sll.se/neas/SAMLConsumer" index="2"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SLL</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SLL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sll.se/</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/login.helsinki.fi.xml b/swamid-interfederations-1.0/login.helsinki.fi.xml
new file mode 100644
index 00000000..986ba144
--- /dev/null
+++ b/swamid-interfederations-1.0/login.helsinki.fi.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDYxNTAwMDAwMFoXDTE1MDYxNTIzNTk1OVowgbcxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
+BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
+HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
+bnRlcjEaMBgGA1UEAxMRbG9naW4uaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDrQpyohqDuaPxlOQDkWC/I/aw1ZhYMjLVDEx7x6XxR
+W9C5J4tTXpYYT3Us+oEUSJObhBTSm9EQ0tbDqnZjubwWZDkXHr1tnyP+JCFoFTZ/
+tqV768I3fE3TKdgEY3paVM8MWZPoyJf4uy1dKCz5lwie3anIYNVXw6mlPqbI9zAT
+b5elTMn+cBw9dML4dAQVODTuDJ2+avRMO4ItuqEj5f5PdI0HUjLU2ejRUQLP2nNX
+2MWgtweWvTIS/IWO1neE3Kn8v3j1VLdS3Xk2t/UBSeGl5e6MARhiHbLtigAWuIZv
+1pznlwdppBOzACm0e3somcJrbFnFOnbGmRQKtXq2yQJ3AgMBAAGjggFkMIIBYDAf
+BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUqm3ksXlN
+/umZswjtgICNhBMvWlAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRbG9n
+aW4uaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBACHDbip+j9xIvdz0WXvF
+4jhBCz4FoGoe7THcFwhVZL8oO3pKGyFHvAFQjdxibgWimOjYQyEnRoE2NYi27ccj
+S3hTQ3xcxoN6Zwq7Nq7iFNmQJ6Lc2uimU5zW7tLRqlTWQKKUm6/niFYv598Mg0PT
+NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
+9W8PdlbMcU04uznzo1v5EggbllAoFoqgWLL36H9zkbkh9NpA3a3j0PyvPaQHzwaC
+54RgRywzt/5g35mU+1cX4gTxt3aP6buBLAaEVtDJ+XQcfZJj3KhPQ2oo2y6Z6fNd
+Ahw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Juha</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi.xml
new file mode 100644
index 00000000..a5ba47cc
--- /dev/null
+++ b/swamid-interfederations-1.0/logout.uwasa.fi.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
new file mode 100644
index 00000000..02ddf702
--- /dev/null
+++ b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
+        <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIQBs4LDAt4QhHxA6/9vcQV2jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
+c2lua2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRJht4CmQi
+9WWU+ep1UhI11GXJTUXY4PzukaXUtO4RbZAnvd0U4Xb5sPDNsCVSIASBX0fkbSZJ
+yQ8FY/PhRk2QIt+erjReWIWA6V3UY6kJIq9IrUh4Z06aGrLvkEjHFbI0VA/AZ/8T
+2BxJrMg3v9mT12B9ueDvybIc6IERiDctRrB+s5nPskvua/2oTq4hDM9mGYTN4ZLB
+fR2OViwPxsGi3V22+iLa66JCmIK8kCeekNhS7OsclWWzIfPpCW1azjUZ2HrRndoi
+A/zJSpmT1rxY8WTchr0xdPdgVDzDZSv/FhRDacbFIC99drSWmg4wiYLvIidDt/zu
+tRoJdUGYPxqljdsyHwftjqqy2YNSMrxD8LDsaF07RZYjpK9GLDXroJzEOhlAJu/c
+qd4+RO+LjF21TWTe4Kw9u4+VNvjrfFDvkj5QAPxti70nOzkqY9Y+T4h1UNkyr8u+
+EGjNLOIE41B5V5MhTkf9x6lQD9IkejHpZA2bP5dmUtBft72UCPCDm2YMkLeXfOI9
+CaBkxLzi4doXmNLjXVEtsVx3qkvyH595ACnSaS/kUfnbgjaMdz15dh7PUPz2OQAE
+P3VijjcTzls96u81aBfHOHY1khqEueKkehJLq7ZFLefy/hcnFDMXWNMSeQaiGDjO
+qMAYHGzjR94Uar2Jvxvwzg2dF3GznzLZeQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB8kuozI2dNLBE+Oy8Ie
+Rp4+GmUeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJt
+b29kbGUuaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBAEkxmg/WVjzPKULi
+7OO3LiKrIgAhRchg8SGfngcgM6E2I8RoLS69/ZC0eWOubAZBJPfvCvaX5u3GWTWd
+dtHeCZWIKOhCFKMj079qWO27O67ys/E//vYakEnSxkpBkQ5u0tyolS7BFQcTWoPR
+BFc/Z+NaZhBmcm7tyFkQsrHTQZTq/s1Anxc7t3sXuUsFl4/LOEwiXkJYoxYOPE7t
+A0iMOwlhJ5VuCIEYZLJ1yA6AZCgJX8TgZvQEdsAxIA6VFJmXsJokBa/wDYQt5fPo
+kBViCHGTlh5cyshXEA2zL/Ywe8EjJkZCDWdoOC+r6CGtxjRxD7tvb/27+1dbYnI0
+Red7UuI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Heiko</md:GivenName>
+    <md:SurName>Schach</md:SurName>
+    <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/moodle.utu.fi.xml b/swamid-interfederations-1.0/moodle.utu.fi.xml
new file mode 100644
index 00000000..185d9fe6
--- /dev/null
+++ b/swamid-interfederations-1.0/moodle.utu.fi.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.utu.fi">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.utu.fi/Shibboleth.sso/DS" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1tb29kbGUudXR1
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0L
+rBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTv
+S/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hv
+QAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO
+4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3
+PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwi
+MfeM0wIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
+ue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
+BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
+Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1tb29kbGUudXR1LmZpMA0GCSqGSIb3
+DQEBBQUAA4IBAQAqzKnyX9RnkwXwOM1szmj5iCMwTLVKl+ULpwxajHKs3Y8qXpgZ
+qR0JGgdAPE+qpWPQHRy+H0wwoAGwJHayyYVqd0WEUD6ET1YqxLGCbPA6I+gCLwN/
+2Gr2zU+BrPZ+Lbx3libwYEe4DtRhrHGvM+EoK703HLyQbAIFbQQG7xrEFOD4yjFB
+grT2zSpweu6njvXsomDNwjdCcG2sP7xOm5+ECGwB7RS85l6tAhkw/LR3msagUpZ5
+rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
+0uKP0MosqHl91zcW2TOx0wxNhL4Hhavhe0hr</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Turun yliopiston Moodle-oppimisalusta</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Turku's Moodle learning management system</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Moodle-oppimisalusta</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Moodle learning management system</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nadja</md:GivenName>
+    <md:SurName>Plankevitch</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Nadja</md:GivenName>
+    <md:SurName>Plankevitch</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/openwiki.feide.no.xml b/swamid-interfederations-1.0/openwiki.feide.no.xml
new file mode 100644
index 00000000..a188bc9c
--- /dev/null
+++ b/swamid-interfederations-1.0/openwiki.feide.no.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <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.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">OpenWiki Administration</md:ServiceName>
+      <md:ServiceName xml:lang="no">OpenWiki Administrasjon</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">OpenWiki Administration is the administration interface where users create new openwikis.</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:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/openwiki.uninett.no.xml b/swamid-interfederations-1.0/openwiki.uninett.no.xml
new file mode 100644
index 00000000..8e67777f
--- /dev/null
+++ b/swamid-interfederations-1.0/openwiki.uninett.no.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/ow.feide.no.xml b/swamid-interfederations-1.0/ow.feide.no.xml
new file mode 100644
index 00000000..0ea833ba
--- /dev/null
+++ b/swamid-interfederations-1.0/ow.feide.no.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ow.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ow.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ow.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">OpenWiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">OpenWiki is a wiki farm solution where everyone can create their own wikis and setup access control.</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:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/portal.clarin.inl.nl.xml b/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
new file mode 100644
index 00000000..33a0d19e
--- /dev/null
+++ b/swamid-interfederations-1.0/portal.clarin.inl.nl.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
+        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
+MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
+A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
+ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
+s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
+d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
+goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
+4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
+AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
+BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
+IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
+dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
+Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
+Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
+b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
+MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
+MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
+bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
+wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
+ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
+JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
+EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/rnd.feide.no.xml b/swamid-interfederations-1.0/rnd.feide.no.xml
new file mode 100644
index 00000000..62f5a657
--- /dev/null
+++ b/swamid-interfederations-1.0/rnd.feide.no.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rnd.feide.no/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <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://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+    <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://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Feide RnD Blog</md:ServiceName>
+      <md:ServiceName xml:lang="no">Feide RnD Blogg</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The blog of Feide RnD</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Bloggen til Feide RnD</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:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/rr.funet.fi.xml b/swamid-interfederations-1.0/rr.funet.fi.xml
new file mode 100644
index 00000000..5c5d5cb3
--- /dev/null
+++ b/swamid-interfederations-1.0/rr.funet.fi.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+        <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
+ZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo3JlR09DvNOKqY8J0
+X+OnAIgOz8mhKid0kjE/2sYlxPf+NJljQnIZYixD/Oj1eX0E2pb7XNZeSaUeBN+y
+Ge0L9b5r72910p0N8G2ZsycUfpzwUc80jJKPi0Vj0wE7M4itwF6ix7wUDLVKm7WF
+j19VdNhEO5v6oKql+Y1+LioWAGymfhxIf92r4VxUq7x4g5AFUwLE3U6MDa7KPreQ
+MVaPYX6MQBjhl1IksuMYiL9l32vRIBnsvKgJLPuj9w4rRLQksIS3Kq/ubaWcHRLV
+2vdTAlwSJGyFVvsKKUaLMa8PDi7Qh9XyGKBYNqpVT/y73Jen0qxB2ey/i/7s8Wpv
+bVaBmtPaSdrEzJAiF97wvShgKsMsMre5gQwb5Xm9+ivBr73nHyDOw8pPCgcXAZRS
+lMTu6YhVDqWpOj/FyGMmMo0Mr0CAsIKPN3uG2iT5ORkVBhtHufUkKbKtA/lHzGVq
+Wd5UXhvqJJCkdIR+6hW0KuhZCV3rQmav9uT5n0TLQehRL1MQWdno/U7e3gx364vt
+kBbSK6fLvRvUsdHI+82MkWfTFNa9auCgQr55cY5o6kDiEc1d7ofqXbMZFY4+9V9s
+A5b4a2rYfYKmA6QzoNz4Ed0ls45i44AbgBVMgB6gjWWnl8cwLGwbtXIXG2lLHJuJ
+ebv5jS3kU2+biivwcXfacBT+XwIDAQABo4IBjjCCAYowHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGdyR9kleLAF9CwyvqrCaVT6cRNi
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzA8BgNVHREENTAzggtyci5mdW5l
+dC5maYIQaGFrYS1yci5mdW5ldC5maYISaGFrYS1ycjAxLmZ1bmV0LmZpMA0GCSqG
+SIb3DQEBBQUAA4IBAQCqH0bVH4duhVkYw63tkRZTRLG83JGJWuZYA6bmntr80Wdp
+1OUW3Ez66sByA6hddAX1trKs+ChOehatsSVV4g9YvZzOT5fEU5kkl5ZX+j8aVHwc
+55q2VVkv9RmCdt23hLPZD6eoNc7uDmz8/Ol94zmd/jcXz5lwq3FNss0yMOJ5W5hz
+HnVn+FAnphU6TsJhBYuXkNziSOkrUeZyUTPpRMsz7OlmdrW+i6sLS6RxUprMM6rV
+aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
+7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/securemail.feide.no.xml b/swamid-interfederations-1.0/securemail.feide.no.xml
new file mode 100644
index 00000000..4117fd4b
--- /dev/null
+++ b/swamid-interfederations-1.0/securemail.feide.no.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://securemail.feide.no/simplesaml/saml2/sp/metadata.php">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://securemail.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://securemail.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Feide SecureMail</md:ServiceName>
+      <md:ServiceName xml:lang="no">Feide SecureMail</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Allows user to in a secure way send messages to others. A better alternative to unencrypted email messages.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">En tjeneste for å sende sikre meldinger til andre. Et godt alternativ til ukryptert e-post.</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:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md: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:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/shibboleth.bbaw.de.xml b/swamid-interfederations-1.0/shibboleth.bbaw.de.xml
new file mode 100644
index 00000000..8ceef1b3
--- /dev/null
+++ b/swamid-interfederations-1.0/shibboleth.bbaw.de.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
+REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
+ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
+aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
+ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
+MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
+V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
++6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
+29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
+GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
+oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
+gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
+AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
+HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
+MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
+a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
+T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
+7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
+znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
+9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
+eQj7ACg8</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kai</md:GivenName>
+    <md:SurName>Zimmer</md:SurName>
+    <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/software.msdnaa.dk.xml b/swamid-interfederations-1.0/software.msdnaa.dk.xml
new file mode 100644
index 00000000..7306b3e2
--- /dev/null
+++ b/swamid-interfederations-1.0/software.msdnaa.dk.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://software.msdnaa.dk/login.ashx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
+      <md:ServiceName xml:lang="da">MSDNAA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide access to relevant Microsoft products for qualified students. The student will, for selected products, be notified by e-mail with product registration/activation information</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til relevante Microsoft-produkter for udvalgte studerende. Den studerende vil for udvalgte produkter modtage e-mail vedrørende produktregistrering og aktiveringsinformation</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml
new file mode 100644
index 00000000..f1ee1523
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
+MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
+A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
+aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
+AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
+mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
+orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
+gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
+OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
+bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
+KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
+bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
+LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
+9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
+uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
+s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
+nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
+OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
+MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Van der Laan</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml
new file mode 100644
index 00000000..f1ee1523
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
+MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
+A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
+aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
+AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
+mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
+orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
+gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
+OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
+bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
+KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
+bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
+LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
+9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
+uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
+s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
+nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
+OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
+MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Van der Laan</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.korp.csc.fi.xml b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
new file mode 100644
index 00000000..45933ebd
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.korp.csc.fi.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU16/1jE06KKH6uErmq
+e2wE5u+8SkWqR4Gks+iH67OiPTgoPSVfx1t55FHDUl1zQjijwcvejH26lYIpS7Ts
+js1MGcjcgEt1qFDDQ/eC6931hIg1jRa0PF/cxFjP9qEcd/I7UxuyM5QJga4pfl/o
+IHSL9oPYi5iCJ6qoC3dgNy0glMiisLkKyOKOHIXYzfAdMlIfRAMGCDAnDj3Kw4wK
+zv+RCWSGPEKHxfnPZwY8fgUs0vugICJBfQkSliUQm9P9l9Pt/8PP3XoIzgfXmxKK
+VQg/3EW+u2dnAzV1OKNrbJAajCJYL4VuGejWE7y8x+ixTqFCCPBT1cFZFWgFnzsh
+Yi0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBTkZV9BIXGhYb67UVmwNByxJxsAITAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILa29ycC5jc2MuZmkwDQYJKoZIhvcNAQEF
+BQADggEBAJClAngseLp5qnRUj2iFSlNVccoP9KZKhLaeqiUk6vvwNdyetfMu9Txi
+vllrbfIaoVMvcA3nE5lfWEAlpvoqnQO/wmDv3ObX/XLJpXqSFpNpDOllhEbVeylT
+v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
+eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
+eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
+5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fin-Clarin</md:GivenName>
+    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jyrki</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sso.utu.fi.xml b/swamid-interfederations-1.0/sso.utu.fi.xml
new file mode 100644
index 00000000..7b50bdbc
--- /dev/null
+++ b/swamid-interfederations-1.0/sso.utu.fi.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
+BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
+MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
+DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
+aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
+vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
+DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
+YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
+Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
+7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
++9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
+kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
+by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
+b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
+ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
+MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
+cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
+ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
+AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
+AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
+AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
+AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
+ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
+AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
+BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
+AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
+QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
+A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
+m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
+nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
+njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
+5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
+8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tuomas</md:GivenName>
+    <md:SurName>Honkala</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petri</md:GivenName>
+    <md:SurName>Teraspuro</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elina</md:GivenName>
+    <md:SurName>Toivanen</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/swamid.user.uu.se.xml b/swamid-interfederations-1.0/swamid.user.uu.se.xml
new file mode 100644
index 00000000..2b484779
--- /dev/null
+++ b/swamid-interfederations-1.0/swamid.user.uu.se.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
+M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
+BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
+u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
+W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
+Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
+gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
+L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
+kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
+qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
+HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
+Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
+lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
+L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
+M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
+BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
+u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
+W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
+Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
+gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
+L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
+kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
+qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
+HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
+Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
+lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
+L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>AKKA SAML2</md:SurName>
+    <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml b/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
new file mode 100644
index 00000000..4d09729f
--- /dev/null
+++ b/swamid-interfederations-1.0/synnefo.sky.deic.dk.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SLO/SOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
+      <md:ServiceName xml:lang="da">Synnefo DeIC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DeIC</md:Company>
+    <md:GivenName>Istvan</md:GivenName>
+    <md:SurName>Bernath</md:SurName>
+    <md:EmailAddress>isbe@adm.dtu.dk</md:EmailAddress>
+    <md:TelephoneNumber>+45 40142359</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/talli.funet.fi.xml b/swamid-interfederations-1.0/talli.funet.fi.xml
new file mode 100644
index 00000000..e9aef664
--- /dev/null
+++ b/swamid-interfederations-1.0/talli.funet.fi.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talli.funet.fi/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+        <mdui:Keywords xml:lang="fi">testi attribuutit</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">test attributes</mdui:Keywords>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEPDCCAySgAwIBAgIRAPVZgYydDTblWmnoE8hJXtcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDA0MzAwMDAwMDBaFw0xMjA0MjkyMzU5NTlaMIGbMQswCQYD
+VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
+BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
+LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjEXMBUGA1UEAxMOdGFsbGkuZnVu
+ZXQuZmkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANiaWHK6o5i9CNsvhO1Z
+EsN1t5tYVEKAkPbdj34A5nZbFuSrtU0ZDakqLuUTHKwYDuOHV7IQfl4Fw4hKNmGk
+T/AH2Sjt+yNSZVzjLBmn370XmqATPTu68Fe28/Gqcb/LR9LAKZ7n2Z/zQ/xvAG/G
+fRmvJyLsVAyuvYSvdijgagtVAgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUDoTAoTwuJwp/7XSVeIKYgnJeK7ow
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOdGFsbGkuZnVuZXQuZmkwDQYJ
+KoZIhvcNAQEFBQADggEBAFXKj9K3Z/RQRJxtVv3yuCxXgs8Xi/9pl6A6RSw7IBdI
+eszHLEBrz/vRRENHcNAVnZwGgfnXJItWZxbiKcRHfG2yFGXkG10fjPxdHwRjyksj
+hPwHefzkEK9b7rJmd+VlfHLGUULnlLIhwJmyaaMPP8wjkDiAk54jGW0Kk2ApdZy5
+I32nlIIGuRYJNa59txFY8lTULe6InHTJ0SBGAlSOaLEdRIL9nXxWYx+JFmV0s+Ag
+eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
+2KCOpM+WV/k5TYUAwOWgA4UPrRLjzevS2njKE5hC8h8=</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://talli.funet.fi/haka/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Tuomi</md:SurName>
+    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 5d59b67f..26ecd068 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -22,7 +22,7 @@
         <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
-        <mdui:Logo width="175" height="73">http://www.geant.org/Logo/PublishingImages/New_GEANT_logo.jpg</mdui:Logo>
+        <mdui:Logo width="175" height="73">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-1.0/terena.org.xml b/swamid-interfederations-1.0/terena.org.xml
new file mode 100644
index 00000000..7b64359e
--- /dev/null
+++ b/swamid-interfederations-1.0/terena.org.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/translation.rnd.feide.no.xml b/swamid-interfederations-1.0/translation.rnd.feide.no.xml
new file mode 100644
index 00000000..b88dfb39
--- /dev/null
+++ b/swamid-interfederations-1.0/translation.rnd.feide.no.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://translation.rnd.feide.no/simplesaml/saml2/sp/metadata.php">
+  <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://translation.rnd.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://translation.rnd.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Feide RnD Translation Portal</md:ServiceName>
+      <md:ServiceName xml:lang="no">Feide RnD Oversettelsesportal</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A web portal for translation of software developed by Feide RnD, such that simpleSAMLphp and Foodle.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">En portal hvor man kan bidra med oversettelse av programvare utviklet av Feide RnD, slik som simpleSAMLphp og Foodle.</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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/tullbommen.arcada.fi.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
new file mode 100644
index 00000000..7e98ca78
--- /dev/null
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://tullbommen.arcada.fi/simplesaml/">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">arcada.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUdHVsbGJvbW1l
+bi5hcmNhZGEuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUB/mi
+pk7Yn/0yQa9rpQ3AMGmR09/45kBJxos6nS9dCbPZ+efy0dNnvcF/hXCbvbnYXHiA
+ZJg1TjBFOJO6jePNplzs8oDWIk5BV/YaWrnKzZnua66m4dfeFIqLXnTrlnR3bBrN
+9GOdSDHdMEuTIntm+2OVnpJUnVLTBsFjqGcnWISsk7DxSWvJJI5cirawQ+RK3yeX
+QSjg/VXpWQYVTahLe938VaZ7LU2cLeNJ0O2ipv5LEXM5mLX7KSbI+/aSOdXi+0Wd
+D7ThYzrjG1cWwIW8YwU1INIZu1wOvzc+r4LyIix4wFaKIoROHiGr/dMbxgz9oOaC
+kaLl2ZdK4OH2h1n/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHR1bGxib21tZW4uYXJj
+YWRhLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBRld8PJrEUESgRtOrIVYJ9cyPENSki
+Dg5PFCvckLcfo6t0Or6Bfq5T5575x695zuKw6pD7xToO3oadzqgohveIWpN+qyEz
+0uuQahsRq9cRVQfd9SGensZWfem3ujQZXk3sGwd350G7CiCcNJcNtbsb1wUdFPjW
+h0xhzFZPrHiD0hjAfx8nDMIlIdN2wQtok0+XHN2mll05DGLG2CtniIAnHEOVWEyH
+/bbmOj3zhw+kGJza5x7tldQLVsPntuBsvm74rKW+nAGVfyqhgWlB5kcTuVCe33sw
+d0vPK8knVsYNfPg0Ms8UNdm1LuFpkjxWiwJ4y9IFW7zf86tmV+ryxuBy</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Arcada</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Arcada</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Arcada</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.arcada.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.arcada.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.arcada.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Finnberg</md:SurName>
+    <md:EmailAddress>mailto:haka.admin@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Sjoberg</md:SurName>
+    <md:EmailAddress>mailto:haka@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Harald</md:GivenName>
+    <md:SurName>Hannelius</md:SurName>
+    <md:EmailAddress>mailto:haka.technical@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-1.0/uat.leeds1.emeraldinsight.com.xml
new file mode 100644
index 00000000..68bc8647
--- /dev/null
+++ b/swamid-interfederations-1.0/uat.leeds1.emeraldinsight.com.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SLO/SOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.leeds1.emeraldinsight.com/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 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="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EmeraldInsight</md:ServiceName>
+      <md:ServiceName xml:lang="da">EmeraldInsight</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til EmeraldInsights tidsskrifter og artikler inden for 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>
diff --git a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml
new file mode 100644
index 00000000..8b7b2688
--- /dev/null
+++ b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
+        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
+HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
+ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
+XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
+495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
+DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
+2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
+5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
+cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
+3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
+fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
+k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
+sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
+adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
+IhAZYQU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml b/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml
new file mode 100644
index 00000000..982ad3d1
--- /dev/null
+++ b/swamid-interfederations-1.0/wayf.card.kilroy.eu.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.card.kilroy.eu/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceName xml:lang="da">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to verify that you are a student</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at verificere at du er studerende</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Webmaster</md:GivenName>
+    <md:EmailAddress>jesper@accedo.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/web.tut.fi.xml b/swamid-interfederations-1.0/web.tut.fi.xml
new file mode 100644
index 00000000..d307e284
--- /dev/null
+++ b/swamid-interfederations-1.0/web.tut.fi.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://web.tut.fi/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQAJccxEo2duCHcGqbD4x1ezANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMTIxMzAwMDAwMFoXDTEzMTIxMjIzNTk1OVowgbkxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
+VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
+VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEWMBQGA1UECxMN
+VGlldG9oYWxsaW50bzETMBEGA1UEAxMKd2ViLnR1dC5maTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMwuC5ZzOZGbCpzsmKNIBH1rkRQRFRnh1MCO9Yj1
+1SswE4yLjA6dETebXoTMrwJb/v7uDVmv7NY33vUDolPxenXmMcfBqLfQI46MPaiV
+0cKAu0RvPHtpmTghnzFZOg4hGvYIAIT1zPkYywg7U4VFyMtJPnPnlOJeHhbh91vT
+TT37n5Fmh9RWUQJsxzfSQmE3xMVNgnPFBe84Pa+rNTbix24MgmV2hgchSuTFBaEq
+MS3Pba1SJETJ1bZcERyJNLTO8m80BuYZrBYuBjheYfQ23jf1Gy/LLgK9yZJNH9ll
+CnMoQfltT+QkOLy84GHbiEVAXzPfrAmqbZOGcHTt3Q7cAOsCAwEAAaOCAV0wggFZ
+MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRs64Sa
+dKhtvd/JVXh5Bnp6NTaw6DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
+AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAVBgNVHREEDjAMggp3
+ZWIudHV0LmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBGpKYnuWg/2lN/WYKM/APV44DW
+7Unb8uV40JE2HIpcTXmbgIf/QZJRyou3MxqJS8/f1C4KGDvrWxMqJbWZIO1FGbtL
+4ghjMFfeg68z7R7uj0Gfz4/pj69oSR5duW/9yBdNQ4igO3cAb+RRCRU4iR1s7oZe
+Pcv6EAzVSd8GmAVe6EwPpiAA5Zi/61nUCXU2SRfI2E35z7XgGo6z2enHQY8WQvMg
+b+GdlT/1WE0+6q1Z5/AzDXSjx9v2lW+NOmJ0/gSEaIo3DAMaL/K1d0Jv03nNTfBb
+00f/455XQUhcJwtLj063dTVgETHTo+6CZeqBbKQCclY/oOUvTOQdT4v+4E1k</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://web.tut.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
+      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jussi</md:GivenName>
+    <md:SurName>Tirkkonen</md:SurName>
+    <md:EmailAddress>jussi.tirkkonen@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/www.emeraldinsight.com.xml b/swamid-interfederations-1.0/www.emeraldinsight.com.xml
new file mode 100644
index 00000000..07391e53
--- /dev/null
+++ b/swamid-interfederations-1.0/www.emeraldinsight.com.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:SurName>SSO-Support</md:SurName>
+    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>