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

author: Paul Scott <paul.scott@kau.se> 2015-05-08 12:45:54 +0200
committer: Paul Scott <paul.scott@kau.se> 2015-05-08 12:45:54 +0200
commit: 93434ad9a5da2d776e8bee002060c29097f98318 (patch)
tree: acb36e7359e34bbaec0ca168d21cd882a83d44a2 /swamid-interfederations-1.0
parent: eb2a83b1767f3c8a27cb03b3ba5a9e29f3c08c6d (diff)
23 files changed, 903 insertions, 433 deletions
diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 6f35035f..c32802e6 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,14 +1,25 @@
 <?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="2015-04-28T13:17:01Z" cacheDuration="PT345600S">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-05-08T16:17:01Z">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-09-21T15:08:32Z" registrationAuthority="https://www.wayf.dk">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+          <mdui:Description xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</mdui:Description>
+          <mdui:Description xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</mdui:Description>
+          <mdui:DisplayName xml:lang="da">Ibistic Services</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">Ibistic Services</mdui:DisplayName>
+        </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
@@ -16,18 +27,18 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
index a385fe38..1116bf08 100644
--- a/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
+++ b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
@@ -1,14 +1,25 @@
 <?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">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://atlases.muni.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-03-14T13:00:00Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er give adgang til tre atlasser: (1) Dermato-patologi, (2) Foster- og neonatal patologi, (3) Patologi for medicinstuderende. Atlasserne kan bruges som undervisningsmateriale for patologistuderende.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is 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.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Patologi-atlasser</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Pathology Images</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <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>
@@ -17,13 +28,13 @@
     </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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <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:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er 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:ServiceDescription xml:lang="en">The purpose is 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:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/auth.asiaportal.info.xml b/swamid-interfederations-1.0/auth.asiaportal.info.xml
index 3cac1605..5dff369f 100644
--- a/swamid-interfederations-1.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-1.0/auth.asiaportal.info.xml
@@ -1,14 +1,25 @@
 <?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://auth.asiaportal.info">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://auth.asiaportal.info">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:55Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at levere fjernadgang til licensbelagte databaser og ressourcer som er indkøbt som konsortiumlicens af NIAS Nordic Council.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide remote access to licence-restricted databases and resources purchased as consortium licences by the NIAS Nordic Council.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">AsiaPortal – NIAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">AsiaPortal – NIAS</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
@@ -17,16 +28,16 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">AsiaPortal – NIAS</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">AsiaPortal – NIAS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide remote access to licence-restricted databases and resources purchased as consortium licences by the NIAS Nordic Council</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at levere fjernadgang til licensbelagte databaser og ressourcer som er indkøbt som konsortiumlicens af NIAS Nordic Council</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">AsiaPortal – NIAS</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at levere fjernadgang til licensbelagte databaser og ressourcer som er indkøbt som konsortiumlicens af NIAS Nordic Council.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide remote access to licence-restricted databases and resources purchased as consortium licences by the NIAS Nordic Council.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
new file mode 100644
index 00000000..17f1bdb3
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:28Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">WAYF Orphanage</mdui:Description>
+        <mdui:Description xml:lang="en">WAYF Orphanage</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WAYF Orphanage</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WAYF Orphanage</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICCTCCAbMCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMCQxIjAgBgNVBAMMGWh0dHBzOi8vb3JwaGFuYWdlLndh
+eWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z
++IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmi
+dPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBy
+kWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/
+YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62c
+JdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynl
+KEvOw1BJAgMBAAEwDQYJKoZIhvcNAQEFBQADQQBwmDBbtojEDHJFNv87YH17Nsn9
+/ivQCCKy/V/ymM01Nwf0nCHhJ29NGvdwUKxBfTA4ennbrAOhl3bOmyMeP/8g
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICCTCCAbMCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMCQxIjAgBgNVBAMMGWh0dHBzOi8vb3JwaGFuYWdlLndh
+eWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z
++IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmi
+dPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBy
+kWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/
+YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62c
+JdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynl
+KEvOw1BJAgMBAAEwDQYJKoZIhvcNAQEFBQADQQBwmDBbtojEDHJFNv87YH17Nsn9
+/ivQCCKy/V/ymM01Nwf0nCHhJ29NGvdwUKxBfTA4ennbrAOhl3bOmyMeP/8g
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/orphanage.wayf.dk/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">WAYF Orphanage</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">WAYF Orphanage</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">WAYF Orphanage</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">WAYF Orphanage</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://wayf.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..20b53db2
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-02-01T11:24:30Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:DisplayName xml:lang="da">Danmarks Tekniske Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Technical University of Denmark</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICHjCCAcgCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vd2F5Zi5haXQuZHR1
+LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
+ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
+nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
+yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
+Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+QQBKXDKQC7uhlYyso7onYgnFEPm+Lho9qKcoseO1GNDMJki6MZRX4to5KEO1z/fM
+iBYNOgtYVi5GqhzvFEzzuu6s
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICHjCCAcgCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vd2F5Zi5haXQuZHR1
+LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
+ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
+nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
+yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
+Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQEFBQAD
+QQBKXDKQC7uhlYyso7onYgnFEPm+Lho9qKcoseO1GNDMJki6MZRX4to5KEO1z/fM
+iBYNOgtYVi5GqhzvFEzzuu6s
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Technical University of Denmark</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Technical University of Denmark</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://www.dtu.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dtu.dk/English.aspx</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>afos@adm.dtu.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..0bff0a35
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-23T14:43:31Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">IT-Universitetet i København</mdui:Description>
+        <mdui:Description xml:lang="en">IT University of Copenhagen</mdui:Description>
+        <mdui:DisplayName xml:lang="da">IT-Universitetet i København</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">IT University of Copenhagen</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICGjCCAcQCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDUxMzAxBgNVBAMMKmh0dHBzOi8vd2F5Zi5pdHUuZGsv
+c2FtbDIvaWRwL21ldGFkYXRhLnBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQUFAANBAHT9
+T30jIdmmI7zQ/AgK1yvCKpw3kWY7NWx6SA045158DY8h3RvWmhm//jWg5Q+Ii60I
+5EHTyfcBHQqNKB0jjY0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICGjCCAcQCAQcwDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UEAwwoUHNldWRvIENB
+IC0gbm8gdHJ1c3QgLSBqdXN0IGEgcHVibGljIGtleTAeFw03MDAxMDEwMDAwMDBa
+Fw0zODEyMzEyMzU5NTlaMDUxMzAxBgNVBAMMKmh0dHBzOi8vd2F5Zi5pdHUuZGsv
+c2FtbDIvaWRwL21ldGFkYXRhLnBocDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
+zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
+lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
+vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
+mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
+R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQUFAANBAHT9
+T30jIdmmI7zQ/AgK1yvCKpw3kWY7NWx6SA045158DY8h3RvWmhm//jWg5Q+Ii60I
+5EHTyfcBHQqNKB0jjY0=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">IT-Universitetet i København</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">IT University of Copenhagen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">IT-Universitetet i København</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">IT University of Copenhagen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://itu.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://itu.dk/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marc Roy</md:GivenName>
+    <md:SurName>Olsen</md:SurName>
+    <md:EmailAddress>mro@itu.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/compute.deic.dk.xml b/swamid-interfederations-1.0/compute.deic.dk.xml
index e70e247e..c9d6586a 100644
--- a/swamid-interfederations-1.0/compute.deic.dk.xml
+++ b/swamid-interfederations-1.0/compute.deic.dk.xml
@@ -1,14 +1,25 @@
 <?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://compute.deic.dk">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQOxaWLcspqkmKbwoSmxj1azANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9jb21wdXRlLmRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtVGW8Dhc8Phrpm0ak4Z6Ue0/Qr5uS6s/szkEvh45cEKbGkErxBn/Ws+Hw6cgfBECdbv85yFVuTMv+4AcPZprsmnCSc/B3CVJTzYqCWe874lR5K21U6umDupND3oAsYAhgbP3fWyryYig5sBISS8PERGFvBZWXoL57K7WBV3agknFeYeQgo2o2kViFK8fa6s0eAFGNuIi1gzVryO+m9sRSnkt2eV/IsqEv+6GHAUAYVmQxDAUkp0HHjlJuDK82xyKWCQy8vnrHIICnuaWK5YTI+ND9C1lKbhUfxQcxJGS8NQBg+LQ8KfQTFUDrdCw63Imt33kRBCJ+I7C4xJ+U1Ab1AgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUveGx/xh4Aj7eldLJPV9dzfG49okwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2NvbXB1dGUuZGVpYy5kazANBgkqhkiG9w0BAQUFAAOCAQEAdf3R6t/6np0uK1IwkBfvADuUZTQr+C94DOYGtP611Ofq9MxT//Pw8sVakURuyArwS8lK6OQh/wQl0ivM7Lv98bE3+MPoEK7wIfnkagfBHJbZxVVBaKW36DH/80zL3k+uZ5Ue38Ds90zDQFSUyM2ni+vOX1vSZCFsyKiAZv+M62ViSXy4gzEyqeqwnHzxc+ewD1RyaupdDBFYmPIG4xG/ZaduuAEK8GGp/9TMmfatfxnsUN0RQE6ypgGqxwNS9o+9QLicZGXJUhNACYdXTW5gGlmxwg8IJOYQb9jN5zJtHuigIKZBsoWTn+1oAVUkFWoIXJr0iTcB83ijR9PUvWuJgQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://compute.deic.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-08-01T15:24:50Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at tillade forskere fra danske universiteter at processere data fra data.deic.dk med virtuelle klynger (stacks) som kan administreres og deles fra en webbrowser.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to allow researchers from Danish academic institutions to process data from data.deic.dk with virtual clusters (stacks) that are administerable and sharable from a web browser.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">compute.deic.dk</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">compute.deic.dk</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEazCCA1OgAwIBAgIQOxaWLcspqkmKbwoSmxj1azANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9jb21wdXRlLmRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtVGW8Dhc8Phrpm0ak4Z6Ue0/Qr5uS6s/szkEvh45cEKbGkErxBn/Ws+Hw6cgfBECdbv85yFVuTMv+4AcPZprsmnCSc/B3CVJTzYqCWe874lR5K21U6umDupND3oAsYAhgbP3fWyryYig5sBISS8PERGFvBZWXoL57K7WBV3agknFeYeQgo2o2kViFK8fa6s0eAFGNuIi1gzVryO+m9sRSnkt2eV/IsqEv+6GHAUAYVmQxDAUkp0HHjlJuDK82xyKWCQy8vnrHIICnuaWK5YTI+ND9C1lKbhUfxQcxJGS8NQBg+LQ8KfQTFUDrdCw63Imt33kRBCJ+I7C4xJ+U1Ab1AgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUveGx/xh4Aj7eldLJPV9dzfG49okwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2NvbXB1dGUuZGVpYy5kazANBgkqhkiG9w0BAQUFAAOCAQEAdf3R6t/6np0uK1IwkBfvADuUZTQr+C94DOYGtP611Ofq9MxT//Pw8sVakURuyArwS8lK6OQh/wQl0ivM7Lv98bE3+MPoEK7wIfnkagfBHJbZxVVBaKW36DH/80zL3k+uZ5Ue38Ds90zDQFSUyM2ni+vOX1vSZCFsyKiAZv+M62ViSXy4gzEyqeqwnHzxc+ewD1RyaupdDBFYmPIG4xG/ZaduuAEK8GGp/9TMmfatfxnsUN0RQE6ypgGqxwNS9o+9QLicZGXJUhNACYdXTW5gGlmxwg8IJOYQb9jN5zJtHuigIKZBsoWTn+1oAVUkFWoIXJr0iTcB83ijR9PUvWuJgQ==</ds:X509Certificate>
@@ -17,24 +28,24 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://compute.deic.dk/simplesamlphp/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://compute.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://compute.deic.dk/simplesamlphp/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://compute.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">compute.deic.dk</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://compute.deic.dk/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://compute.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">compute.deic.dk</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to allow researchers from Danish academic institutions to process data from data.deic.dk with virtual clusters (stacks) that are administerable and sharable from a web browser</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at tillade forskere fra danske universiteter at processere data fra data.deic.dk med virtuelle klynger (stacks) som kan administreres og deles fra en webbrowser</md:ServiceDescription>
-      <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: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.9" 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:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">compute.deic.dk</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at tillade forskere fra danske universiteter at processere data fra data.deic.dk med virtuelle klynger (stacks) som kan administreres og deles fra en webbrowser.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to allow researchers from Danish academic institutions to process data from data.deic.dk with virtual clusters (stacks) that are administerable and sharable from a web browser.</md:ServiceDescription>
+      <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" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/data.deic.dk.xml b/swamid-interfederations-1.0/data.deic.dk.xml
index 28026a21..5a340998 100644
--- a/swamid-interfederations-1.0/data.deic.dk.xml
+++ b/swamid-interfederations-1.0/data.deic.dk.xml
@@ -1,14 +1,25 @@
 <?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://data.deic.dk">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZjCCA06gAwIBAgIRAKo8n3hbrvSEZ3actEbkz1kwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzA3MDgwMDAwMDBaFw0xNjA3MDcyMzU5NTlaMDoxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMZGF0YS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqx5ivoqKJ/KoH4FApMuG8iBdSYGrK6+8KMPG3W7EpSVP8W56IA7KqKULEeafv8zkJ86/1lrLZ64QQ4tSjikb2QR19w9aqk6sHWrfg+PkgauAMxjLAdHCNj56ROqq2HhzqTjAkrX+2DH6Jc40i5tqbwkvjrvcMynqoS9zYrtNjDhxksh/cfqNpXi0gUte+xRagtRXUDDby0dSCVaMKMYVgkiqRtXpunrKivMllIpgu+yWr3N05QQM4M1CbfzAEjDXSEKzBLM+sd15P9GpPeeLHe3uDUMUn3cpmGMOa40UwbU9vh9nh/5G0pVj3X3bXY8IUlBeJ+Zz1UtiHF0ZXohdRQIDAQABo4IBaTCCAWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD4II0iS1SdcmrbSxxXs8+4Z7yYVMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAOggxkYXRhLmRlaWMuZGswDQYJKoZIhvcNAQEFBQADggEBAEO3Nvt1nm9NgqA2nNSjMXFCTx29wt9UNEu6uwiWge1Kg0giBSMaBZmVcVjqTKEjiC+iUX+4Q9w7/ejxQdVYDanielhSpoTTYWpVHq+ZGAIthc+tYlhQzcdNQwWLo4/oUuqQS+czM7zj7Du8uZuStCnTulS4aQX6F9SX9QX8gO4gcrloUsK6DMERIws+fGKtxR1Y2R5PGlRHZmHdutZavP85tTcwKXkxuNblvoRHnfsGI/EayZ/USnEtlLG6cLDJKyL4uqPzBZ6po9T66EYgvAFdez8WMvTL2+D98BFnFrpw65cFM6flOjjxHUDm8nueq02YAu6BI8sgRK6SZKLzTfc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://data.deic.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-07-12T23:58:32Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at tillade forskere fra danske universiteter at uploade, håndtere og dele data.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to allow researchers from Danish academic institutions to upload, manage and share data.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">data.deic.dk</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">data.deic.dk</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEZjCCA06gAwIBAgIRAKo8n3hbrvSEZ3actEbkz1kwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzA3MDgwMDAwMDBaFw0xNjA3MDcyMzU5NTlaMDoxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMZGF0YS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqx5ivoqKJ/KoH4FApMuG8iBdSYGrK6+8KMPG3W7EpSVP8W56IA7KqKULEeafv8zkJ86/1lrLZ64QQ4tSjikb2QR19w9aqk6sHWrfg+PkgauAMxjLAdHCNj56ROqq2HhzqTjAkrX+2DH6Jc40i5tqbwkvjrvcMynqoS9zYrtNjDhxksh/cfqNpXi0gUte+xRagtRXUDDby0dSCVaMKMYVgkiqRtXpunrKivMllIpgu+yWr3N05QQM4M1CbfzAEjDXSEKzBLM+sd15P9GpPeeLHe3uDUMUn3cpmGMOa40UwbU9vh9nh/5G0pVj3X3bXY8IUlBeJ+Zz1UtiHF0ZXohdRQIDAQABo4IBaTCCAWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD4II0iS1SdcmrbSxxXs8+4Z7yYVMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAOggxkYXRhLmRlaWMuZGswDQYJKoZIhvcNAQEFBQADggEBAEO3Nvt1nm9NgqA2nNSjMXFCTx29wt9UNEu6uwiWge1Kg0giBSMaBZmVcVjqTKEjiC+iUX+4Q9w7/ejxQdVYDanielhSpoTTYWpVHq+ZGAIthc+tYlhQzcdNQwWLo4/oUuqQS+czM7zj7Du8uZuStCnTulS4aQX6F9SX9QX8gO4gcrloUsK6DMERIws+fGKtxR1Y2R5PGlRHZmHdutZavP85tTcwKXkxuNblvoRHnfsGI/EayZ/USnEtlLG6cLDJKyL4uqPzBZ6po9T66EYgvAFdez8WMvTL2+D98BFnFrpw65cFM6flOjjxHUDm8nueq02YAu6BI8sgRK6SZKLzTfc=</ds:X509Certificate>
@@ -17,24 +28,24 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://data.deic.dk/simplesamlphp/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://data.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://data.deic.dk/simplesamlphp/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://data.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">data.deic.dk</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://data.deic.dk/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.deic.dk/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">data.deic.dk</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to allow researchers from Danish academic institutions to upload, manage and share data</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at tillade forskere fra danske universiteter at uploade, håndtere og dele data</md:ServiceDescription>
-      <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: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.9" 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:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">data.deic.dk</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at tillade forskere fra danske universiteter at uploade, håndtere og dele data.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to allow researchers from Danish academic institutions to upload, manage and share data.</md:ServiceDescription>
+      <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" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/dev.wiseflow.dk.xml b/swamid-interfederations-1.0/dev.wiseflow.dk.xml
index a46887a9..e52a0d04 100644
--- a/swamid-interfederations-1.0/dev.wiseflow.dk.xml
+++ b/swamid-interfederations-1.0/dev.wiseflow.dk.xml
@@ -1,48 +1,52 @@
 <?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://dev.wiseflow.dk">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.wiseflow.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-12-19T20:51:32Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WISEflow dev</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow dev</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgISESGN5Wvxcvytdf/HTMhbFEk/MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMxMTIxMTM1MjA2WhcNMTQxMjMxMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG8MIIBuDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQCXpVjrhLApjVv+gianFNVw9rfxh1TqsqB1SaImeMTfmaMFKZdVwU8rvIaG7QKrJ8Q6DddNuILkCJsYdPFIT4a9XTpNLztSA0otwSQdw/PQilxyN+anGYNTEMjMYaiN7lbab4jifU85UHBdXliOQ/4x17vADrPT7zVR019ZkmUs/6jjIJCVxnGxUhlDersSXLfIMffOGj+pEqqe2cM0Xdyn9WWQ6OqoHkW5Mpk0bFYRV2KgGsh6H8zqFz3Bpl245IcpGipteoVUV6jAsovk3xUv8fTS18Hjvyg76E8B8pKYyVGjfmogt6EaLfdRBVu18caqSUmLMwszQXEjRakqwGp1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgISESGN5Wvxcvytdf/HTMhbFEk/MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMxMTIxMTM1MjA2WhcNMTQxMjMxMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG8MIIBuDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQCXpVjrhLApjVv+gianFNVw9rfxh1TqsqB1SaImeMTfmaMFKZdVwU8rvIaG7QKrJ8Q6DddNuILkCJsYdPFIT4a9XTpNLztSA0otwSQdw/PQilxyN+anGYNTEMjMYaiN7lbab4jifU85UHBdXliOQ/4x17vADrPT7zVR019ZkmUs/6jjIJCVxnGxUhlDersSXLfIMffOGj+pEqqe2cM0Xdyn9WWQ6OqoHkW5Mpk0bFYRV2KgGsh6H8zqFz3Bpl245IcpGipteoVUV6jAsovk3xUv8fTS18Hjvyg76E8B8pKYyVGjfmogt6EaLfdRBVu18caqSUmLMwszQXEjRakqwGp1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsLpPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpGb/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dKP8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
+          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow dev</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to facilitate digital management of written exams</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at facilitere digital håndtering af skriftlige eksaminer</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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: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: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:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-1.0/europe-stage.wiseflow.net.xml
new file mode 100644
index 00000000..e00265dd
--- /dev/null
+++ b/swamid-interfederations-1.0/europe-stage.wiseflow.net.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://europe-stage.wiseflow.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-04-28T15:48:14Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WISEflow europe-stage</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow europe-stage</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+DCCA+CgAwIBAgISESHw40eVZ2+g94YP6RlXCEbaMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzEwMTgxNzMyWhcNMTgwMzEwMTgxNzMyWjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMMDioud2lzZWZsb3cubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzMjfRmXG9H6hqK6WUP02BfBmcbBGvseeV8oEmiwmyDl8ZrCah2Jgxap4tJYj2jQUEvWkYFCIUKkFcsu/lIXD0waEYZU6+pXwEgJVwdMW6un+hLuDiCALoN8E3iXAGGH2z+xlrOASuABFRo7eQ13VNRHA6o2O4B1fLaNLQvCdIfx96ae94mZ52G33am1awGSleXNmnpURoyQZThD2KfSeXhAsiFyLyRhM9d+Z+VzFKtltFKyHC7oBHiTpWCgzgo9ica9HgDAFHhPd5pFS5iSLwRy32XlWBA3mjXuZMy/ampOBkolrBaRCEWIRynhGW4v+CNAN13/nhGq6Eo32kIK0hQIDAQABo4IBzjCCAcowDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQIBMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCcGA1UdEQQgMB6CDioud2lzZWZsb3cubmV0ggx3aXNlZmxvdy5uZXQwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQg7R8eDlQVzIfAkbXNo4Uq7ESiYTAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAOi0l9VrsGoEam5K3TdLjmTNkog3fFYDDjw+tla/2gQ/NoGuTt09Sq1scwmq6I5gygKOQccHSfTgECR/7/XNj4Exy73PZo9kGFYCZBdmhsAZsO9IjeStKe2VIrC8iMhHFBtKxBXRbMVyYFNA6wwR0yuehaNHVhTbJhBjoatmDcwiXy+C2FjKNRkpfWZSkn7hKXYQxf6j/www/rjq3F6oYbOS2iWXbCxmNGv8RSqHrI5QiKgmHlnmJJnZvN6PhINVD9DLndixqfIQAydHxAlb+WpDu5mMzXqqeGqxEbgs99aNxCrAXa5JO07mk075C4hIZn6RW6jWZ7QCealwmMlH+xw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe-stage_wayf"/>
+    <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://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml1-acs.php/europe-stage_wayf" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">WISEflow europe-stage</md:ServiceName>
+      <md:ServiceName xml:lang="en">WISEflow europe-stage</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIWISE ApS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIWISE ApS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uniwise.dk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/europe.wiseflow.net.xml b/swamid-interfederations-1.0/europe.wiseflow.net.xml
new file mode 100644
index 00000000..ede73cb1
--- /dev/null
+++ b/swamid-interfederations-1.0/europe.wiseflow.net.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://europe.wiseflow.net">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-04-28T21:38:43Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WISEflow europe</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow europe</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+DCCA+CgAwIBAgISESHw40eVZ2+g94YP6RlXCEbaMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzEwMTgxNzMyWhcNMTgwMzEwMTgxNzMyWjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMMDioud2lzZWZsb3cubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzMjfRmXG9H6hqK6WUP02BfBmcbBGvseeV8oEmiwmyDl8ZrCah2Jgxap4tJYj2jQUEvWkYFCIUKkFcsu/lIXD0waEYZU6+pXwEgJVwdMW6un+hLuDiCALoN8E3iXAGGH2z+xlrOASuABFRo7eQ13VNRHA6o2O4B1fLaNLQvCdIfx96ae94mZ52G33am1awGSleXNmnpURoyQZThD2KfSeXhAsiFyLyRhM9d+Z+VzFKtltFKyHC7oBHiTpWCgzgo9ica9HgDAFHhPd5pFS5iSLwRy32XlWBA3mjXuZMy/ampOBkolrBaRCEWIRynhGW4v+CNAN13/nhGq6Eo32kIK0hQIDAQABo4IBzjCCAcowDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQIBMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCcGA1UdEQQgMB6CDioud2lzZWZsb3cubmV0ggx3aXNlZmxvdy5uZXQwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQg7R8eDlQVzIfAkbXNo4Uq7ESiYTAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAOi0l9VrsGoEam5K3TdLjmTNkog3fFYDDjw+tla/2gQ/NoGuTt09Sq1scwmq6I5gygKOQccHSfTgECR/7/XNj4Exy73PZo9kGFYCZBdmhsAZsO9IjeStKe2VIrC8iMhHFBtKxBXRbMVyYFNA6wwR0yuehaNHVhTbJhBjoatmDcwiXy+C2FjKNRkpfWZSkn7hKXYQxf6j/www/rjq3F6oYbOS2iWXbCxmNGv8RSqHrI5QiKgmHlnmJJnZvN6PhINVD9DLndixqfIQAydHxAlb+WpDu5mMzXqqeGqxEbgs99aNxCrAXa5JO07mk075C4hIZn6RW6jWZ7QCealwmMlH+xw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe_wayf"/>
+    <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://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml1-acs.php/europe_wayf" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">WISEflow europe</md:ServiceName>
+      <md:ServiceName xml:lang="en">WISEflow europe</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNIWISE ApS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNIWISE ApS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uniwise.dk</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 07e84357..cc3885c7 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -319,6 +319,7 @@
       <shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sigdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/software.msdnaa.dk-.xml b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
index 7306b3e2..5158417c 100644
--- a/swamid-interfederations-1.0/software.msdnaa.dk-.xml
+++ b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
@@ -1,14 +1,25 @@
 <?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">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-05-26T10:05:21Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at give adgang til relevante Microsoft-produkter for udvalgte studerende. Den studerende vil for udvalgte produkter modtage e-mail vedrørende produktregistrering og aktiveringsinformation.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is 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.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">MSDNAA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MSDNAA</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
@@ -17,18 +28,18 @@
     </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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <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:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er 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:ServiceDescription xml:lang="en">The purpose is 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:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
index 6261ab0f..58385529 100644
--- a/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEezCCA2OgAwIBAgIQbFP2zBUPa2qKmnvEij297DANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMTAyMzAwMDAwMFoXDTE2MTAyMjIzNTk1OVowRTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExd0b2tlbnNpZ25pbmcuYWl0LmR0dS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqAUfbI6hct5ZYP3tNyUHAo+D+U0cVqZqCTJDfQWpO6+tSCRgmHY9Teu1pOR8Ddw/OdVI7R3lmTmWOWUuJHr4DDrAEQyvhmDklCDB78tbzBbbF514C5gyoagh1xAXn5bv9IPg4ByBCyi3Gbuwy4fBvpneVnpInaleRwNhWuxsPZWbpnHyaYBhjzTyA6U33cWXMdxZKXtPPgqPZvCfcsWagnzU90LgdCsumrulkTI0AZnLPzmYBH0ZpYUKVkIvbba53N5s96VJ7zbCCWrsnRQ42seGi1TQRpbPVd6jlegUvQJ2J/M4dtpMBjr3siWT/b9AN7IpnN5hcp9ZYl+ju/B38CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQjNdOyedlmcPWRhMy3I9+igVdZWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXdG9rZW5zaWduaW5nLmFpdC5kdHUuZGswDQYJKoZIhvcNAQEFBQADggEBAH3nPUupxXENBOof3REi6WHldSXIc59DkUw1Rng81XYh39A7SaHkGxGz1WYVKIzYNlzmhsDSl3JfluaWwpdNcpMh3VklKa453zM7He8u3jpSC+5sez0LSmWV/TRY0q3rASSNRMcDetGwm5/tgKCzX28cNvrqm2xAjrnNS2/BQlrSi4txHlxBxL39r6zkZ10h7ED6NO9F+ShCIcCZZMIwYeXOQqDY6pR4qJ7SI09O74RkSHF+Pdd7lNyRzZiFoM77yI0Aot0XxQqMKD7otqiNuKObpJ4OrC90pzrEOufKPmEe9tkHExlcpALfCv2UaFCsVZc0YHymIFgcXKvYX4Y3gTY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-10-24T14:14:51Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Share DTU</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Share DTU</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEezCCA2OgAwIBAgIQbFP2zBUPa2qKmnvEij297DANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMTAyMzAwMDAwMFoXDTE2MTAyMjIzNTk1OVowRTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExd0b2tlbnNpZ25pbmcuYWl0LmR0dS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqAUfbI6hct5ZYP3tNyUHAo+D+U0cVqZqCTJDfQWpO6+tSCRgmHY9Teu1pOR8Ddw/OdVI7R3lmTmWOWUuJHr4DDrAEQyvhmDklCDB78tbzBbbF514C5gyoagh1xAXn5bv9IPg4ByBCyi3Gbuwy4fBvpneVnpInaleRwNhWuxsPZWbpnHyaYBhjzTyA6U33cWXMdxZKXtPPgqPZvCfcsWagnzU90LgdCsumrulkTI0AZnLPzmYBH0ZpYUKVkIvbba53N5s96VJ7zbCCWrsnRQ42seGi1TQRpbPVd6jlegUvQJ2J/M4dtpMBjr3siWT/b9AN7IpnN5hcp9ZYl+ju/B38CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQjNdOyedlmcPWRhMy3I9+igVdZWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXdG9rZW5zaWduaW5nLmFpdC5kdHUuZGswDQYJKoZIhvcNAQEFBQADggEBAH3nPUupxXENBOof3REi6WHldSXIc59DkUw1Rng81XYh39A7SaHkGxGz1WYVKIzYNlzmhsDSl3JfluaWwpdNcpMh3VklKa453zM7He8u3jpSC+5sez0LSmWV/TRY0q3rASSNRMcDetGwm5/tgKCzX28cNvrqm2xAjrnNS2/BQlrSi4txHlxBxL39r6zkZ10h7ED6NO9F+ShCIcCZZMIwYeXOQqDY6pR4qJ7SI09O74RkSHF+Pdd7lNyRzZiFoM77yI0Aot0XxQqMKD7otqiNuKObpJ4OrC90pzrEOufKPmEe9tkHExlcpALfCv2UaFCsVZc0YHymIFgcXKvYX4Y3gTY=</ds:X509Certificate>
@@ -17,29 +28,29 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.ait.dtu.dk/adfs/ls/" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.ait.dtu.dk/adfs/ls/" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Share DTU</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.ait.dtu.dk/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Share DTU</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte</md:ServiceDescription>
-      <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.10" 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:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">Share DTU</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Technical University of Denmark</md:OrganizationName>
     <md:OrganizationName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technical University of Denmark</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Technical University of Denmark</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="da">Danmarks Tekniske Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="en">Technical University of Denmark</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="da">http://www.dtu.dk/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:EmailAddress>tato@dtu.dk</md:EmailAddress>
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
index 4d09729f..64b951ff 100644
--- 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
@@ -1,14 +1,25 @@
 <?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">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-09-10T16:48:01Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Synnefo DeIC</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Synnefo DeIC</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <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>
@@ -17,17 +28,17 @@
     </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: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:AttributeConsumingService index="1" isDefault="true">
       <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:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 7b64359e..32995ffc 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
@@ -16,17 +35,30 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
index 901dbec1..0b5296b6 100644
--- a/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
+++ b/swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://urn.nbi.ku.dk/saml/sp/wayf">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICsDCCAZgCCQC/WydSa4uKBDANBgkqhkiG9w0BAQUFADAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswHhcNMTQxMTA1MTE0MTU1WhcNMjQxMTA0MTE0MTU1WjAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA7kWkLsBYJAKgCdKhSBN/t7gDN3CzmPB31X5Zzs8BUKD7y4MAw89xsxgE2D1efiTkO+yL20Buy4V7LWo3sbdkrnoOl8jWXITM/2AiubUla+3z+ZY0DtSPFeMhkGE65ATXtU6UaaEsGzrXxmS1vQXeGNOVbWYFSIASXKoUxyGEPuXl48ndJorQzHsNePSfppcExDLtpr5Rr66PM2LiZstA1jZY5zE7Dn30SVZegiKEK/yQNILVr77Dk/aYxZlxYqMt1DRbrPmweCYo1HeL8TUEvAKENb/t9lsO7tTsqjoJcHOssmiMiNrMmfHL590/B/SecGzO8Owt+7VRUWoD2R9RAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACpR0e4SuFcLPgr0yGvDTTvRm+aiztxVc0eBbYygLcBDiyQKDnYwTTXrNYkCo9fKV2JEBbiVMTZOotxYXUZy/bvdmaZtXsYNkE3+G22zEa+DhrlUUnSjy0d49agQqm/ABrnmy7Zj7cKiRwu+UVusghFANNAx51VmL1tufQQLTYgjFpSH6L8HYOnk+4+zPX1NXStYVbuAEmnJy33JJbWIZP6RqSsEtfrpN8iW/uyNtgW5ptbU9/HaeeRMlj3gm/RUUs507JSFk4/w1PzSqjzn5DTQq1hBcWOawXd0ER7AS0f1keV6SFUplw8kXnKlxb8EAU5/S1jjSKrSSBoptF/VDYA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://urn.nbi.ku.dk/saml/sp/wayf">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-11-05T13:01:40Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at give adgang til NBI-tjenester.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide access to NBI web services.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">NBI's Applikationsserver</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NBI Application Server</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICsDCCAZgCCQC/WydSa4uKBDANBgkqhkiG9w0BAQUFADAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswHhcNMTQxMTA1MTE0MTU1WhcNMjQxMTA0MTE0MTU1WjAaMRgwFgYDVQQDEw9sb2dpbi5uYmkua3UuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA7kWkLsBYJAKgCdKhSBN/t7gDN3CzmPB31X5Zzs8BUKD7y4MAw89xsxgE2D1efiTkO+yL20Buy4V7LWo3sbdkrnoOl8jWXITM/2AiubUla+3z+ZY0DtSPFeMhkGE65ATXtU6UaaEsGzrXxmS1vQXeGNOVbWYFSIASXKoUxyGEPuXl48ndJorQzHsNePSfppcExDLtpr5Rr66PM2LiZstA1jZY5zE7Dn30SVZegiKEK/yQNILVr77Dk/aYxZlxYqMt1DRbrPmweCYo1HeL8TUEvAKENb/t9lsO7tTsqjoJcHOssmiMiNrMmfHL590/B/SecGzO8Owt+7VRUWoD2R9RAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACpR0e4SuFcLPgr0yGvDTTvRm+aiztxVc0eBbYygLcBDiyQKDnYwTTXrNYkCo9fKV2JEBbiVMTZOotxYXUZy/bvdmaZtXsYNkE3+G22zEa+DhrlUUnSjy0d49agQqm/ABrnmy7Zj7cKiRwu+UVusghFANNAx51VmL1tufQQLTYgjFpSH6L8HYOnk+4+zPX1NXStYVbuAEmnJy33JJbWIZP6RqSsEtfrpN8iW/uyNtgW5ptbU9/HaeeRMlj3gm/RUUs507JSFk4/w1PzSqjzn5DTQq1hBcWOawXd0ER7AS0f1keV6SFUplw8kXnKlxb8EAU5/S1jjSKrSSBoptF/VDYA=</ds:X509Certificate>
@@ -18,14 +29,14 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.nbi.ku.dk/wayf/sp/logout"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.nbi.ku.dk/wayf/sp/postResponse" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NBI Application Server</md:ServiceName>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">NBI's Applikationsserver</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide access to NBI web services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at give adgang til NBI-tjenester</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.11" 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:ServiceName xml:lang="en">NBI Application Server</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at give adgang til NBI-tjenester.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide access to NBI web services.</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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/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
index 982ad3d1..e9cf1b35 100644
--- 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
@@ -1,14 +1,25 @@
 <?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">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.card.kilroy.eu/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-02-21T12:04:13Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at verificere at du er studerende.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to verify that you are a student.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">ISIC – Student Verification Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ISIC – Student Verification Service</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <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>
@@ -17,16 +28,16 @@
     </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: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-Artifact" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <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:ServiceName xml:lang="en">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at verificere at du er studerende.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to verify that you are a student.</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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/wayf.ordbogen.com.xml b/swamid-interfederations-1.0/wayf.ordbogen.com.xml
index 6c9d78d5..c98f6c6e 100644
--- a/swamid-interfederations-1.0/wayf.ordbogen.com.xml
+++ b/swamid-interfederations-1.0/wayf.ordbogen.com.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://wayf.ordbogen.com">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://wayf.ordbogen.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-04-20T15:26:54Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Ordbogen.com</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ordbogen.com</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
@@ -17,16 +28,16 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.ordbogen.com/saml2/sp/SingleLogoutService.php"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.ordbogen.com/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.ordbogen.com/saml2/sp/AssertionConsumerService.php" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til</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:2.5.4.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.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.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution.</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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 7ba10430..4467c121 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationInstant="2008-03-28T00:00:00Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
       <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tietgen.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
@@ -15,150 +24,75 @@
       <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">frberg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ags.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nordfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">midtfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">middelfart-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">opengym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">maribo-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mulerne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nakskov-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">norreg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nyborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ribekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sctknud-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">svendborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tgy.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tornbjerg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vestfyns-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucfyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufyn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sopu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosufh.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">faaborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">og.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aa.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ak.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">akat.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">asg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eg.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">lg.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ra.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">rs.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sgy.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosur.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">stv.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">udc.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vd.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vhg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">via.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">natmus.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sst.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosuc.cphwest.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cphwest.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">akf.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bst.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dmi.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ism.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ens.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fbo.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fob.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kuc.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kul.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ami.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sfi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ank.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vfc.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">stm.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vej.minibib.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosu-syd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">videndjurs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">munkensdam.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">odensekatedralskole.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nghf.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">cg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hs-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kolding-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ikgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">naestved-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">learnmark.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aabc.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">aalborgstudenterkursus.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">hasseris-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">statsskolen.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosusj.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vuc-vs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nykat-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">dalumls.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">fredericia-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">ghg.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">koldcollege.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">bggym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vibkat.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vghf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">horsensgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eucvest.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
       <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">itcn.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">mf-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">techcollege.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">tradium.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">vucnordjylland.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">bcsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
@@ -166,6 +100,7 @@
       <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
@@ -180,11 +115,12 @@
       <shibmd:Scope regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
-      </saml:Attribute>
+      <mdui:UIInfo>
+        <mdui:Description xml:lang="da">WAYF - den danske identitetsfederation for forskning og uddannelse</mdui:Description>
+        <mdui:Description xml:lang="en">WAYF - The Danish identity federation for research and higher education</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WAYF - Where Are You From</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WAYF - Where Are You From</mdui:DisplayName>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
@@ -212,4 +148,9 @@
     <md:OrganizationURL xml:lang="da">http://wayf.dk/index.php/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>WAYF</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wiseflow.dk.xml b/swamid-interfederations-1.0/wiseflow.dk.xml
index a36da442..e3fc3dd5 100644
--- a/swamid-interfederations-1.0/wiseflow.dk.xml
+++ b/swamid-interfederations-1.0/wiseflow.dk.xml
@@ -1,48 +1,52 @@
 <?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://wiseflow.dk">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wiseflow.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-02-19T14:22:07Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WISEflow</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgISESGN5Wvxcvytdf/HTMhbFEk/MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMxMTIxMTM1MjA2WhcNMTQxMjMxMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG8MIIBuDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQCXpVjrhLApjVv+gianFNVw9rfxh1TqsqB1SaImeMTfmaMFKZdVwU8rvIaG7QKrJ8Q6DddNuILkCJsYdPFIT4a9XTpNLztSA0otwSQdw/PQilxyN+anGYNTEMjMYaiN7lbab4jifU85UHBdXliOQ/4x17vADrPT7zVR019ZkmUs/6jjIJCVxnGxUhlDersSXLfIMffOGj+pEqqe2cM0Xdyn9WWQ6OqoHkW5Mpk0bFYRV2KgGsh6H8zqFz3Bpl245IcpGipteoVUV6jAsovk3xUv8fTS18Hjvyg76E8B8pKYyVGjfmogt6EaLfdRBVu18caqSUmLMwszQXEjRakqwGp1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgISESGN5Wvxcvytdf/HTMhbFEk/MA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTMxMTIxMTM1MjA2WhcNMTQxMjMxMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggG8MIIBuDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbGcyLmNybDCBiAYIKwYBBQUHAQEEfDB6MEEGCCsGAQUFBzAChjVodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbGcyLmNydDA1BggrBgEFBQcwAYYpaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsZzIwHQYDVR0OBBYEFDWkeXXAWKP/NtMfriWD19/ncjzAMB8GA1UdIwQYMBaAFJat+rBbuYNkKnbCHIpp2kLc/v0oMA0GCSqGSIb3DQEBBQUAA4IBAQCXpVjrhLApjVv+gianFNVw9rfxh1TqsqB1SaImeMTfmaMFKZdVwU8rvIaG7QKrJ8Q6DddNuILkCJsYdPFIT4a9XTpNLztSA0otwSQdw/PQilxyN+anGYNTEMjMYaiN7lbab4jifU85UHBdXliOQ/4x17vADrPT7zVR019ZkmUs/6jjIJCVxnGxUhlDersSXLfIMffOGj+pEqqe2cM0Xdyn9WWQ6OqoHkW5Mpk0bFYRV2KgGsh6H8zqFz3Bpl245IcpGipteoVUV6jAsovk3xUv8fTS18Hjvyg76E8B8pKYyVGjfmogt6EaLfdRBVu18caqSUmLMwszQXEjRakqwGp1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEuP0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwBAgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGswCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsLpPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpGb/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dKP8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
+          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WISEflow</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to facilitate digital management of written exams</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at facilitere digital håndtering af skriftlige eksaminer</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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: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: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:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">WISEflow</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
index 07391e53..2e3ae927 100644
--- a/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,31 +1,42 @@
 <?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">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-07-05T11:31:07Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide personalized access to journals and papers on social sciences.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Emerald Insight</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Emerald Insight</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <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: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: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:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <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:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide personalized access to journals and papers on social sciences.</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" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -33,13 +44,6 @@
     <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>
@@ -47,4 +51,11 @@
     <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
     <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
   </md:ContactPerson>
+  <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:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/www.ordbogen.com.xml b/swamid-interfederations-1.0/www.ordbogen.com.xml
index 8515d870..739fa0af 100644
--- a/swamid-interfederations-1.0/www.ordbogen.com.xml
+++ b/swamid-interfederations-1.0/www.ordbogen.com.xml
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://www.ordbogen.com">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://www.ordbogen.com">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-08-25T10:31:29Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Ordbogen.com</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Ordbogen.com</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEdjCCA16gAwIBAgILAQAAAAABLysKVFswDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExFjAUBgNVBAsTDU9iamVjdFNpZ24gQ0ExITAfBgNVBAMTGEdsb2JhbFNpZ24gT2JqZWN0U2lnbiBDQTAeFw0xMTA0MDYxMzI1NDZaFw0xMzA0MDYxMzI1NDRaMEwxCzAJBgNVBAYTAkRLMQ8wDQYDVQQIEwZPZGVuc2UxFTATBgNVBAoTDE9yZGJvZ2VuIEEvUzEVMBMGA1UEAxMMT3JkYm9nZW4gQS9TMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAovIjWe1fOERH9N7Dk7OP9K1YveGQZipKE+GaOHnCNe33F4a1sXMhT38fEUNWQpRLDBeLsWF2G5FnwrVDGb3qo8dN7e4ycZWbZIBuC/lyq8qRt6iIxNHQ7oad8N2m7CTe3ZNdkPHEY8eaDHUP2AC8c1SXyakv394WKuT2roIZ4OD74pv9CTDGFVNsbgOU1xTM+QIvbRSUDmVGBdkUv5tstC9w7R7UdhrW8R1wYcTwA9UxMNEiCNBvyMTfAcJO32FzDTa5nBopyoAK4jgGEdrz8Oeb17MCb+sStxJiZRTuFCgkvuNkCNXEuBBYiNDAyB8AwsLKMw6IzBPCG88NfcmUZwIDAQABo4IBQDCCATwwHwYDVR0jBBgwFoAU0lvzSyZLpbDnXf1Wf/bxLjhOU6AwTgYIKwYBBQUHAQEEQjBAMD4GCCsGAQUFBzAChjJodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9PYmplY3RTaWduLmNydDA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09iamVjdFNpZ24uY3JsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEyMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgQQMA0GCSqGSIb3DQEBBQUAA4IBAQA0lPLNM6+JLbeGyjZQ5tU7H4c1hX1WcAAGgRVF1oVtTEH8vA4V+roVB35+8Jk08rzqh+ghIUX99P2keUTOlllYUbxb7DXfsOprD5tDGc/jmMMZrYzL3ibdW0229/eaokXMPI6As7ApvQ7utb+sjftwQoI9BkJlbMRoW//t2GYY3bP7+r7yDUbcOVwNUm3ZoxErIM7SulpTS36uP8jcr0zPOwRAx6atMmtNVfZlt91FR3xzvrnfFLPv5YzZ5euAqFnhxmW97co1IgOElcHazmcj+m/uTaoCjaGhxB6eg7cZePuQW0iX7Ufcb0YIAHczY1d+ZfCe5wTuSYnbdJGwoor7</ds:X509Certificate>
@@ -18,15 +29,15 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/SingleLogoutService.php"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til</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:2.5.4.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.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.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at levere en online ordbog hvori du kan foretage et ubegrænset antal opslag i de ordbøger som din institution har købt adgang til.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide an online dictionary in which you can look up an unlimited number of words in the dictionaries bought by your educational institution.</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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
author	Paul Scott <paul.scott@kau.se>	2015-05-08 12:45:54 +0200
committer	Paul Scott <paul.scott@kau.se>	2015-05-08 12:45:54 +0200
commit	93434ad9a5da2d776e8bee002060c29097f98318 (patch)
tree	acb36e7359e34bbaec0ca168d21cd882a83d44a2 /swamid-interfederations-1.0
parent	eb2a83b1767f3c8a27cb03b3ba5a9e29f3c08c6d (diff)