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

33 files changed, 2409 insertions, 1 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 5848e6ac..fae36ad8 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-11-02T18:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-11-02T19:17:01Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
new file mode 100644
index 00000000..a385fe38
--- /dev/null
+++ b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.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/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..ac7aacde
--- /dev/null
+++ b/swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.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/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
new file mode 100644
index 00000000..91edbfcc
--- /dev/null
+++ b/swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.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-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
new file mode 100644
index 00000000..40e8b13c
--- /dev/null
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.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-idp-shibboleth.xml b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..4fd30a12
--- /dev/null
+++ b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..09d7ec24
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.aalto.fi-idp-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: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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c373b984
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..d75aeb63
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.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.lapinamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..e1e1e9e7
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.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-idp.xml b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
new file mode 100644
index 00000000..840bd980
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.metropolia.fi-idp.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..4e0db6ad
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.shh.fi-idp-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: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-shibboleth2.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
new file mode 100644
index 00000000..8fe21a38
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..5c0771e6
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.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-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..2c4ebebd
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.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/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
new file mode 100644
index 00000000..986ba144
--- /dev/null
+++ b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.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-idp-shibboleth.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..a5ba47cc
--- /dev/null
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.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-shibboleth.xml b/swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml
new file mode 100644
index 00000000..02ddf702
--- /dev/null
+++ b/swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.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/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..8e67777f
--- /dev/null
+++ b/swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.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/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/rr.funet.fi-attribute-test.xml b/swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml
new file mode 100644
index 00000000..5c5d5cb3
--- /dev/null
+++ b/swamid-interfederations-1.0/rr.funet.fi-attribute-test.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/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml
new file mode 100644
index 00000000..8ceef1b3
--- /dev/null
+++ b/swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.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.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-sso-idp.xml b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
new file mode 100644
index 00000000..7b50bdbc
--- /dev/null
+++ b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.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/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml b/swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml
new file mode 100644
index 00000000..4d09729f
--- /dev/null
+++ b/swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.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/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
new file mode 100644
index 00000000..7b64359e
--- /dev/null
+++ b/swamid-interfederations-1.0/terena.org-sp.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/tullbommen.arcada.fi-simplesaml-.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
new file mode 100644
index 00000000..7e98ca78
--- /dev/null
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.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/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
new file mode 100644
index 00000000..8b7b2688
--- /dev/null
+++ b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.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-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..982ad3d1
--- /dev/null
+++ b/swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.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/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
new file mode 100644
index 00000000..07391e53
--- /dev/null
+++ b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.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>