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

author: Leif Johansson <leifj@sunet.se> 2015-06-05 12:55:47 +0200
committer: Leif Johansson <leifj@sunet.se> 2015-06-05 12:55:47 +0200
commit: ad5533391ff5117a06d15a72d725ff4bb460a1dc (patch)
tree: 9b18599b0c3488e9561bde6a8993524603e20b4d /swamid-interfederations-2.0
parent: f495fc32c4f6a39d4f8fb5827e09b4331449a8d5 (diff)
41 files changed, 1760 insertions, 2373 deletions
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
index 2414cfbe..2ff562e5 100644
--- a/swamid-interfederations-2.0/.xml
+++ b/swamid-interfederations-2.0/.xml
@@ -1,109 +1,44 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
-	<!--
-		This is a Shibboleth 2 IdP for St George's Hospital Medical School.
-	-->
-	<Extensions>
-		<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-
-
-
-
-	</Extensions>
-	<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-			<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-			<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-				<mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
-				<mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
-				<mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
-				<mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
-			</mdui:UIInfo>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:X509Data>
-					<ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
-						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
-						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
-						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
-						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
-						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
-						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
-						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
-						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
-						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
-						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
-						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
-						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
-						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
-						qCZw
-					</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-		<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-		<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-		<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-	</IDPSSODescriptor>
-	<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-		<Extensions>
-			<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sgul.ac.uk</shibmd:Scope>
-		</Extensions>
-		<KeyDescriptor use="signing">
-			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-				<ds:X509Data>
-					<ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
-						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
-						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
-						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
-						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
-						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
-						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
-						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
-						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
-						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
-						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
-						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
-						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
-						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
-						qCZw
-					</ds:X509Certificate>
-				</ds:X509Data>
-			</ds:KeyInfo>
-		</KeyDescriptor>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-		<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-		<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-		<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-	</AttributeAuthorityDescriptor>
-	<Organization>
-		<OrganizationName xml:lang="en">St George's Hospital Medical School</OrganizationName>
-		<OrganizationDisplayName xml:lang="en">St George's, University of London</OrganizationDisplayName>
-		<OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</OrganizationURL>
-	</Organization>
-	<ContactPerson contactType="support">
-		<GivenName>Keith</GivenName>
-		<SurName>Carr</SurName>
-		<EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-	<ContactPerson contactType="technical">
-		<GivenName>Keith</GivenName>
-		<SurName>Carr</SurName>
-		<EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-	</ContactPerson>
-
-</EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2015-06-05T16:17:02Z">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-09-21T15:08:32Z" registrationAuthority="https://www.wayf.dk">
+        <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+      </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+          <mdui:Description xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</mdui:Description>
+          <mdui:Description xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</mdui:Description>
+          <mdui:DisplayName xml:lang="da">Ibistic Services</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">Ibistic Services</mdui:DisplayName>
+        </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHXzCCBkegAwIBAgIQDMeEM2c3CblrZFIKO0GQjzANBgkqhkiG9w0BAQsFADB1 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 d3cuZGlnaWNlcnQuY29tMTQwMgYDVQQDEytEaWdpQ2VydCBTSEEyIEV4dGVuZGVk IFZhbGlkYXRpb24gU2VydmVyIENBMB4XDTE1MDUwODAwMDAwMFoXDTE3MDUyNjEy MDAwMFowgfMxHTAbBgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYB BAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVz Z2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjE1MDELMAkGA1UEBhMCREsxEzARBgNV BAgMCkvDuGJlbmhhdm4xETAPBgNVBAcTCE5vcmRoYXZuMSkwJwYDVQQKEyBJYmlz dGljIFRlY2hub2xvZ2llcyBEZW5tYXJrIEEvUzEdMBsGA1UEAxMUc2VydmljZXMu aWJpc3RpYy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeu9hD FugX9bZh30fItW4XhUbcbWnPke78qYgoTI9xXEHYlgllWMta5/ETFcx1By9KQqlf uCj9gEJKZUrY7HkpUHcnBh9uy5AHKgr25nDQDexo4KEI6A7iFhhtm9XqeBTwbWDv 3hO797o5axvSVYihHgyP6XHU3J/NZWSVXj8hGpPNjFDl0Y55j35zVEKRIRlUgNQw idRtYlAUZ4psja65xxS3NVip92aQJbsUws2P4slMl/TOlRdUXFtuXjehR/0/DWr2 7RgTb/UveHVFwd49D7iHZASkupNoTkEXmABil2C3+x/aFrc+wL0zcuPLOa/omUmr wHjtUHz6a2ACn6sNAgMBAAGjggNqMIIDZjAfBgNVHSMEGDAWgBQ901Cl1qCt7vNK YApl0yHU+PjWDzAdBgNVHQ4EFgQUgqS5gDRU87YDX5zvYnkzGlGcF+YwHwYDVR0R BBgwFoIUc2VydmljZXMuaWJpc3RpYy5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjB1BgNVHR8EbjBsMDSgMqAwhi5odHRw Oi8vY3JsMy5kaWdpY2VydC5jb20vc2hhMi1ldi1zZXJ2ZXItZzEuY3JsMDSgMqAw hi5odHRwOi8vY3JsNC5kaWdpY2VydC5jb20vc2hhMi1ldi1zZXJ2ZXItZzEuY3Js MEIGA1UdIAQ7MDkwNwYJYIZIAYb9bAIBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8v d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYgGCCsGAQUFBwEBBHwwejAkBggrBgEFBQcw AYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFIGCCsGAQUFBzAChkZodHRwOi8v Y2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRTSEEyRXh0ZW5kZWRWYWxpZGF0 aW9uU2VydmVyQ0EuY3J0MAwGA1UdEwEB/wQCMAAwggF+BgorBgEEAdZ5AgQCBIIB bgSCAWoBaAB1AKS5CZC0GFgUh7sTosxncAo8NZgE+RvfuON3zQ7IDdwQAAABTTJ8 GxYAAAQDAEYwRAIgBBRuMiDiJZa5zANatXS03c2D7qhpYfloN5oaK/T+OB0CIG/X gIau1AT8F/M5t0c6VCFTkQNhuAwE1Zqg6wETHKxbAHcAaPaY+B9kgr46jO65KB1M /HFRXWeT1ETRCmesu09P+8QAAAFNMnwa4wAABAMASDBGAiEA7Xw5JKAslun8W4fE pa/U8aOIU29tHxIb6/8wcAdsPDoCIQD74Zr3vEV9BnpvH0D2dEDvD4lPKgNJbbyD 3YXWfEPRLgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABTTJ8 HCEAAAQDAEcwRQIhAJQDPNlM/gc6dKnTZFtU2rB7f7btnNPF05x8C57I/rf8AiBY jeGTJ/QsymHdFFT124Qfbi10OMYBVLcWByRJpO3FeTANBgkqhkiG9w0BAQsFAAOC AQEAoshqkbqYBa5eoDKbF6JYoH7uLf4v82aVUi0zR1UDjF9gWYD8JKrlBbNQHtFu GoTsLcK2662DSXMpXPLtxKSnhIqfh2CrROCCrd4FX0gF8pCRrvkH4eW3fkEdoi/W ouuSogo4ESGhHPa/2MNtruvBbYW9bgdoRYZusjcRC619b/hf9cnEElqxh6QsOkXl LqJGnEPb6LeYVsyNxrlXQCZSre4npf/mLSnZG71+QxXjyphYRiGG0XsXYFHt/YGs PHusR4lxKGn03xb831m7G36mremKV6ma9dqgnSEQfsQn68UDhWJQNU9G3pD7cNWl mKpVPzsaEHAm1FpiDI50bKTFhw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at håndtere og godkende leverandørfakturarer i en webbaseret løsning.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to handle and approve supplier invoices in a web-based solution.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.asiaportal.info.xml b/swamid-interfederations-2.0/auth.asiaportal.info.xml
index 6e95aec4..5dff369f 100644
--- a/swamid-interfederations-2.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-2.0/auth.asiaportal.info.xml
@@ -1,50 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.asiaportal.info">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
+    <mdrpi:RegistrationInfo 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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">AsiaPortal: Databases and other resources provided by the Nordic Institute of Asian Studies</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to databases and other resources for Nias Nordic Council Member institutions</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://guide.asiaportal.info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://guide.asiaportal.info/privacypolicy/V1</mdui:PrivacyStatementURL>
+      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <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>
         </ds:X509Data>
       </ds:KeyInfo>
     </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: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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.asiaportal.info/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://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">AsiaPortal Resources by Nordic Institute of Asian Studies</md:ServiceName>
-      <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:basic"/>
+    <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="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">AsiaPortal – NIAS</md:ServiceName>
+      <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:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>bib@nias.ku.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 131efe85..d3f9784c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -1,55 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/metadata.php">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-12T14:25:09Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-12T14:25:09Z" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dtu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dtu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly93
+YXlmLmFpdC5kdHUuZGsvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
+MDAwMDBaFw0yNTEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vd2F5Zi5h
+aXQuZHR1LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
+CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
+sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
+rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
+pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
+Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAFLiQoHCoNhKCkBY6mFKLePGqnubEwiHRvnAFwDTbzhM1l1m5ZUW
+iHF23a7Rcg1KHVp4LQ3OgbeH5FVssEBRHyINDlFrdTHozYtzeDkTZgi7/Cg24wqQ
+BnVtITujEJatVPNyfYN2ID8DMVNB+7x7iRpRbusj05UGcguFvkRPF/s9OhKkEHuY
+CmpPNruZm9ubkqkJ/8jRLuL4oCxQ0O7INGbNn3tKhka0ekEeuj6qfod0D5zJvTSL
+3v6mMX8MkShdTtY7SLyT90nN6t/4cW7tvi9HVhBOFr/N+vBQkm58rCWcV/+nw2OV
+yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly93
+YXlmLmFpdC5kdHUuZGsvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
+MDAwMDBaFw0yNTEyMzEyMzU5NTlaMDkxNzA1BgNVBAMMLmh0dHBzOi8vd2F5Zi5h
+aXQuZHR1LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejF
+CU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35
+sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxe
+rwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwB
+pCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIc
+Xddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAFLiQoHCoNhKCkBY6mFKLePGqnubEwiHRvnAFwDTbzhM1l1m5ZUW
+iHF23a7Rcg1KHVp4LQ3OgbeH5FVssEBRHyINDlFrdTHozYtzeDkTZgi7/Cg24wqQ
+BnVtITujEJatVPNyfYN2ID8DMVNB+7x7iRpRbusj05UGcguFvkRPF/s9OhKkEHuY
+CmpPNruZm9ubkqkJ/8jRLuL4oCxQ0O7INGbNn3tKhka0ekEeuj6qfod0D5zJvTSL
+3v6mMX8MkShdTtY7SLyT90nN6t/4cW7tvi9HVhBOFr/N+vBQkm58rCWcV/+nw2OV
+yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,8 +76,6 @@ iBYNOgtYVi5GqhzvFEzzuu6s
     <md:OrganizationURL xml:lang="en">http://www.dtu.dk/English.aspx</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:EmailAddress>afos@adm.dtu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index bb67673c..c7a23e4e 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -1,57 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/metadata.php">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-23T14:43:31Z" registrationAuthority="https://www.wayf.dk">
+    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>itu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
+YXlmLml0dS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLml0dS5k
+ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
+/rlkEIuvFxDe1h4FO7WMFh3dIkC82lrGIjeQ2A+W3y63c8B5IMZtdWhPijud4isC
+9Hwfe4vZrdtQR+apYuWNha2SyVC7oCGPwitPpLc8VNU52BqA0drRpR/fkwi9g/81
+08MC3kiKYZQWptngeJFCcXnfj2XZ1EXP1U5cans1LLoWgJW4sxV0OpjLnE1jad3d
+7ClrQbgQfm/MUEo2xsbB+pp3VQOYN3c6+zXyVxNeHX0qSyOiJH+1Thk+xVcQn6yI
+3AbECYrCM2XBdYFYQ3JVD06i
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
+YXlmLml0dS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
+MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLml0dS5k
+ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
+lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
+x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
+jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
+tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
+d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
+AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
+/rlkEIuvFxDe1h4FO7WMFh3dIkC82lrGIjeQ2A+W3y63c8B5IMZtdWhPijud4isC
+9Hwfe4vZrdtQR+apYuWNha2SyVC7oCGPwitPpLc8VNU52BqA0drRpR/fkwi9g/81
+08MC3kiKYZQWptngeJFCcXnfj2XZ1EXP1U5cans1LLoWgJW4sxV0OpjLnE1jad3d
+7ClrQbgQfm/MUEo2xsbB+pp3VQOYN3c6+zXyVxNeHX0qSyOiJH+1Thk+xVcQn6yI
+3AbECYrCM2XBdYFYQ3JVD06i
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,8 +78,8 @@ T30jIdmmI7zQ/AgK1yvCKpw3kWY7NWx6SA045158DY8h3RvWmhm//jWg5Q+Ii60I
     <md:OrganizationURL xml:lang="en">http://itu.dk/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: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-2.0/clarin.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
index c8c85005..ce1d630c 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-10-24T13:14:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarin.ids-mannheim.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://clarin.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://clarin.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=clarin.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGHGxHhl3eDANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
@@ -63,49 +51,44 @@ ABUoJ1obWyY9SigpZd9CB/VoXuLVlNumJhdE8pblkmiuQoPMjANXqSJxXTc3VoaM
 Hgk+0Pprizij1Ay8rR6gS02YjZqh0AFcxfRtgf0WDJpU73m0WLdinZ2/9WEF4HeX
 4kZ8oRe3FrE90Nk79pA+/ghhQWJey5ryo2+RZY/ST5PIhyNVonJxN24nHttUmC+x
 nEIJAu56xR9tXHpXpZbsdp6tGG7Q1lkVH3o/8UNzCtWDcSN1p9zjFU11jO79bgJo
-VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo
-</ds:X509Certificate>
+VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Oliver</md:GivenName>
-    <md:SurName>Schonefeld</md:SurName>
-    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Andreas</md:GivenName>
     <md:SurName>Witt</md:SurName>
     <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Schonefeld</md:SurName>
+    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>AAI</md:GivenName>
     <md:SurName>Team</md:SurName>
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
index 48e3ebac..a17cb200 100644
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -1,42 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.oeaw.ac.at/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-01-23T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarin.oeaw.ac.at/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN Centre Wien / Language Resources Portal</mdui:DisplayName>
         <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/ccv/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="fi">Humanististen tieteiden digitaalinen hakemisto kielentutkimuksen resurssien tallennukseen ja jakeluun</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://clarin.oeaw.ac.at/ccv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
@@ -54,66 +36,46 @@ NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
 +kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
 Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
 QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
-rI8v6OTvibpLrg==
-</ds:X509Certificate>
+rI8v6OTvibpLrg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN Centre Wien / Language Resources Portal</md:ServiceName>
       <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Humanististen tieteiden digitaalinen hakemisto kielentutkimuksen resurssien tallennukseen ja jakeluun</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
-      <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Karlheinz</md:GivenName>
+    <md:SurName>Morth</md:SurName>
+    <md:EmailAddress>mailto:karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Matej</md:GivenName>
     <md:SurName>Durco</md:SurName>
-    <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Karlheinz</md:GivenName>
-    <md:SurName>Mörth</md:SurName>
-    <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
+    <md:EmailAddress>mailto:matej.durco@oeaw.ac.at</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>ICLTT-tech</md:GivenName>
     <md:SurName>Office</md:SurName>
-    <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Akademie-Rechenzentrum</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
+    <md:EmailAddress>mailto:icltt-tech@oeaw.ac.at</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
index cb891039..4c89e026 100644
--- a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
+++ b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.phonetik.uni-muenchen.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-09-25T14:34:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarin.phonetik.uni-muenchen.de">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Bayerisches Archiv für Sprachsignale</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Bavarian Archive for Speech Signals</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein Repository von phonetischen Daten (Signale und Annotation/Segmentierungen) und verschiedene Webservices die diese Daten verarbeiten, bereitgestellt vom Bayerischen Archiv für Sprachsignale (BAS)</mdui:Description>
-        <mdui:Description xml:lang="en">A repository for data of phonetic data (signals and annotations/segmentations) and several services processing this data provided by the Bavarian Archive of Speech Signals (BAS)</mdui:Description>
-        <mdui:Logo height="156" width="396">https://www.phonetik.uni-muenchen.de/forschung/bay_arch_sprsig/bas_logo_german.jpg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.phonetik.uni-muenchen.de/forschung/Bas/BasPolicyAAIPrivacy_eng.pdf</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Baijerin Arkisto puhesignaaleille Palveluntarjoaja</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bavarian Archive for Speech Signals Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Akateemisen käytön pääsynhallinta Baijerin puhesignaalien arkiston rajoitetuille resursseille</mdui:Description>
+        <mdui:Description xml:lang="en">Bavarian Archive for Speech Signals Service Provider (for accessing to academic use restricted resources)</mdui:Description>
+        <mdui:Logo height="150" width="356">https://www.en.phonetik.uni-muenchen.de/research/bav_arch_spsig/bas_logo_englisch.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Bavarian Archive for Speech Signals Service Provider</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.phonetik.uni-muenchen.de/forschung/Bas/BasPolicyAAIPrivacy_eng.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.en.phonetik.uni-muenchen.de/funktionen/privacy/index.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.phonetik.uni-muenchen.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.phonetik.uni-muenchen.de,OU=Institut fuer Phonetik und Sprachverarbeitung,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGN7gvIyUTjANBgkqhkiG9w0BAQsFADCBkDELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
 BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
@@ -56,53 +54,44 @@ QLoWazb9Tb+Xqo47GQrqzdc9pUX0HDDIi/U8gMn+LVrnWVx/Nuhq5G0+zWsEnnS7
 kxTfM5w8IfUOK8tOo6JF7lDe1Y8d9LtMhAadjvfh3XKg3xYMnXoj8HGux6Fpfd2H
 7bXhWeSUsZwoyvkrpBSk29DD8YZHb9gEDBYT+0F7fWuAmKOMfKWbr/1KYC4Ml0af
 XaIzi4rLf+cstPUOYYP5DzKfCf6eZ2DEimz2Y62KXIXftNEGeQ8ELZSARlqvHc/m
-cdriseFaC9wD+9FMZhAznUg=
-</ds:X509Certificate>
+cdriseFaC9wD+9FMZhAznUg=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Bayerisches Archiv für Sprachsignale</md:ServiceName>
-      <md:ServiceName xml:lang="en">Bavarian Archive for Speech Signals</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein Repository von phonetischen Daten (Signale und Annotation/Segmentierungen) und verschiedene Webservices die diese Daten verarbeiten, bereitgestellt vom Bayerischen Archiv für Sprachsignale (BAS)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">A repository for data of phonetic data (signals and annotations/segmentations) and several services processing this data provided by the Bavarian Archive of Speech Signals (BAS)</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Baijerin Arkisto puhesignaaleille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Bavarian Archive for Speech Signals Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Akateemisen kayton paasynhallinta Baijerin puhesignaalien arkiston rajoitetuille resursseille</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Bavarian Archive for Speech Signals Service Provider (for accessing to academic use restricted resources)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e29</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e29</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://lmuidp.lrz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://lmuidp.lrz.de</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Kisler</md:SurName>
-    <md:EmailAddress>mailto:kisler@phonetik.uni-muenchen.de</md:EmailAddress>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Administration</md:SurName>
+    <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Klaus</md:GivenName>
-    <md:SurName>Jänsch</md:SurName>
+    <md:SurName>Technical Support</md:SurName>
     <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Klaus</md:GivenName>
-    <md:SurName>Jänsch</md:SurName>
-    <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
+  <md:ContactPerson contactType="support">
+    <md:SurName>User Support</md:SurName>
+    <md:EmailAddress>mailto:kisler@phonetik.uni-muenchen.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index fab02064..ac7aacde 100644
--- a/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:25:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
         <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
         <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
index 2e4defa5..e00265dd 100644
--- a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe-stage.wiseflow.net">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-04-28T15:48:14Z" registrationAuthority="https://www.wayf.dk">
+    <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:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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>
@@ -15,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>
@@ -23,25 +28,25 @@
     </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" index="0" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" index="1" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml1-acs.php/europe-stage_wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="2" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf"/>
+    <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 FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="gn" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonLIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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>
@@ -50,8 +55,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe.wiseflow.net.xml b/swamid-interfederations-2.0/europe.wiseflow.net.xml
index 0d23bd3e..17762873 100644
--- a/swamid-interfederations-2.0/europe.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe.wiseflow.net.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe.wiseflow.net">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-04-28T21:38:43Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-29T12:55: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:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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:DisplayName xml:lang="da">WISEflow</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WISEflow</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>
@@ -23,25 +28,25 @@
     </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" index="0" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" index="1" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml1-acs.php/europe_wayf"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="2" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf"/>
+    <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:ServiceName xml:lang="da">WISEflow</md:ServiceName>
+      <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 FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="gn" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonLIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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>
@@ -50,8 +55,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/filesender.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 6d81fa4c..da3a3dbe 100644
--- a/swamid-interfederations-2.0/filesender.funet.fi.xml
+++ b/swamid-interfederations-2.0/filesender.funet.fi.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.funet.fi">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://filesender.funet.fi">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://filesender.funet.fi/simplesaml/module.php/saml/disco.php" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Funet FileSender</mdui:DisplayName>
@@ -24,9 +14,13 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQX2leAqJlB3Q/3iPF8QljNTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -67,10 +61,10 @@ o9pAScnCYOeqNoQ//wrcSVQcwozZLhGlymlLAyDI0rx/hM9v+8PL1E0iFmf/</ds:X509Certificate
       <md:ServiceDescription xml:lang="fi">Funet FileSender tarjoaa helpon ja turvallisen tavan jakaa suuria tiedostoja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Funet FileSender offers an easy and a secure way to share large files with anyone.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Funet FileSender erbjuder en latt och saker satt att dela stora datafilar till vem som helst.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
index de7f7a57..91edbfcc 100644
--- a/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
+++ b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-05-05T06:16:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Foodle</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nn">Foodle</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</mdui:Description>
-        <mdui:Description xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</mdui:Description>
-        <mdui:Description xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://rnd.feide.no/software/foodle/foodle-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
         </ds:X509Data>
@@ -43,26 +22,20 @@
       <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid: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.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index e5cd0dc8..a5061535 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fse.eduuni.fi/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
         <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="fi">Eduuni on sähköisen työskentelyn ja verkostoitumisen palveluympäristö.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
 BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
@@ -64,9 +59,9 @@ An5aXL3c9Q==</ds:X509Certificate>
       <md:ServiceName xml:lang="fi">Eduuni</md:ServiceName>
       <md:ServiceName xml:lang="en">Eduuni</md:ServiceName>
       <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
index 72f6b0fd..79cbe41c 100644
--- a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aalto.fi/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalto.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
+      <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
         <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</mdui:Description>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -73,11 +67,11 @@ ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Timo</md:GivenName>
     <md:SurName>Tunturi</md:SurName>
-    <md:EmailAddress>mailto:idp-admin@aalto.fi</md:EmailAddress>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>IdP</md:GivenName>
-    <md:SurName>Support</md:SurName>
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
     <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 84136891..8889ea8a 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abo.fi/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.abo.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abo.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
@@ -27,12 +17,16 @@
         <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>abo.fi</mdui:DomainHint>
       </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
diff --git a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
index 8b7384c9..bc2fc1fe 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,20 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
@@ -27,14 +17,18 @@
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>csc.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index 07c82f9a..f72711a6 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,426 +1,418 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.feide.no">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2012-10-09T13:08:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.feide.no">
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Feide</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">Feide</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nn">Feide</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Feide is the login system for norwegian educational and research institusions.</mdui:Description>
-        <mdui:Description xml:lang="no">Feide er innloggingssiden for norske utdannings- og forskningsinstitusjoner.</mdui:Description>
-        <mdui:Description xml:lang="nn">Feide er innloggingssida for norske utdannings- og forskningsinstitusjonar.</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agdenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aho.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alstahaug.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">andebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aremark.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arendal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">as-skole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aure.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austagderfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austevoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">austrheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">averoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">baerum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balestrand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balsfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bamble.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bardu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bergensskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">berlevag.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">betanien.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bremanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonhjemmet.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eideskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eidsvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elverum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enebakk.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etne.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etnedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evenes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fedje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.afjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ahk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.amot.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.egms.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.farsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.harstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.kg.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.levanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.lund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.mosseskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nlm.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.oknett.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.osloskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rade.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rissa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roan.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.roros.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.rygge.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.sarpsborg.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.skedsmo.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.ski.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.stranda.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.trysil.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">feide.verdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffk.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fitjar.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjaler.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjell.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fjellhaug.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flaa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flatanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flesberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flora.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folkeuniversitetet.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">folldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forde.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">forsand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fosnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">framnes.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frana.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frogn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frosta.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">froya.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fusa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fyresdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gaular.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">giske.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjerdrum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gjesdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gloppen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gran.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grane.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">granvin.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gratangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grimstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grong.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.alesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.haram.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.skodje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gs.sula.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gulen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ha.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hadsel.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haldenskole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halsa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamar.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hammerfest.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haraldsplass.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemne.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hil.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">himolde.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hin.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinesna.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hint.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hioa.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hiof.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hisf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hist.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hit.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hitra.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hive.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hivolda.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjartdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hjelmeland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hobol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hol.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">holeskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hornindal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">horten.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoyanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karasjok.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karlsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kautokeino.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klabu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">klepp.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kongsvinger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristiansund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvam.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvanangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvinnherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesjaskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loppa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loten.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyngen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malselv.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">malvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">metisutdanning.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mhs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midsund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mrfylke.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namdalseid.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">narvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-ak.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nes-bu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesseby.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nesset.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nhh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nih.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nissedal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nith.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntg.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntnu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nvh.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oddaskolen.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oksnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oppland.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ho.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osteroy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">overhalla.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oygarden.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rakkestad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ralingen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rana.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">randaberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rauma.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">re.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rendalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rennesoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringebu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ringsaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rogfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rollag.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salangen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sami.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samisk.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauherad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sigdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjaakskulane.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skoler.alta.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smola.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snasa.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snillfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sogndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sonans.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">songdalen.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sortland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorum.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spusers.feide.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">spydeberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stange.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stavanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">steinkjer.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stjordal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">storfjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stpaul.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strand.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stryn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suldal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sund.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunndal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surnadal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svelvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">t-fk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tana.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">time.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tingvoll.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tolga.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonsberg.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tromso.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trondheim.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tydal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tynset.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysnes.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tysver.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uia.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uib.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uin.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uio.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uit.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensaker.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ullensvang.herad.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ulvik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umb.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uninett.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsira.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaalerskolene.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaf.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaga.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagan.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vagsoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vaksdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">valer-of.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vang.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vefsn.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestby.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vestvagoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfk.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgsa.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vik.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vindafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vinje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">agdenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aho.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">alstahaug.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">alvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aremark.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">arendal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">asker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austevoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">austrheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">averoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">baerum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">balestrand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">balsfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bamble.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bardu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bergensskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">berlevag.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">betanien.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bremanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">cmi.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">diakonhjemmet.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eideskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">eidsvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">elverum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">enebakk.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">etne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">etnedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">evenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fedje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.afjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ahk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.amot.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.bjugn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.egms.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.engerdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.farsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.harstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.holtalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.kg.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.leksvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.levanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.lorenskog-skole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.lund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.mosseskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nesodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nlm.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.nord-fron.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.oknett.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.orkdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.orlandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.osen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.osloskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rade.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ringerike.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rissa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.roan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.roros.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.rygge.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.sarpsborg.com</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.skedsmo.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.ski.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stor-elvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">feide.verdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fitjar.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjellhaug.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flatanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">flora.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">folkeuniversitetet.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">folldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">forde.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">forsand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fosnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">framnes.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frogn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">froland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fyresdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjerdrum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gjesdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gran.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grane.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">granvin.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gratangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grimstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">grong.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.haram.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hamar.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hammerfest.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hattfjelldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">heroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hil.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">himolde.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hin.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hinesna.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hint.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hioa.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hiof.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hisf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hist.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hit.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hitra.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hive.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hivolda.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hjartdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hjelmeland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hobol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hol.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hurum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karasjok.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karlsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kautokeino.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">klabu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">klepp.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kongsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kongsvinger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristiansand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristiansund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvam.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvanangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvinnherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lavangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">loppa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lyngdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lyngen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">malselv.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">malvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">met.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">metisutdanning.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">modum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namdalseid.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">narvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nes-ak.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nesseby.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nhh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nissedal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nith.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ntfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ntg.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ntnu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nvh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oddaskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oksnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oppdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oppland.org</shibmd:Scope>
+      <shibmd:Scope regexp="false">os-ho.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">osteroy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">overhalla.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oygarden.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oystre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">phs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">porsanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">porsgrunn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rakkestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ralingen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">randaberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rauma.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">re.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rendalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rennebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rennesoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ringebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ringsaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rogfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rollag.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">salangen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samisk.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sandnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sauherad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">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>
+      <shibmd:Scope regexp="false">skjaakskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skoler.alta.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">smola.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">snasa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sonans.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">songdalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sortland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">spydeberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stange.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stavanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">steinkjer.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stjordal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">storfjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stpaul.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">strand.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">stryn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">suldal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sund.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sunndal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">surnadal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">svelvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">t-fk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">time.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tingvoll.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tolga.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tonsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tromso.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">trondheim.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tydal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tynset.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tysnes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tysver.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uia.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uib.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uin.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uio.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uis.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uit.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ullensaker.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ullensvang.herad.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ulvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">umb.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">uninett.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">utsira.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaalerskolene.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaga.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vagan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vagsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vaksdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">valer-of.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vang.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vefsn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestby.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestre-slidre.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vestvagoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vfk.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vgsa.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDhjCCAm4CCQCZwrMQOJ3URzANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVW5pbmV0dCBBUzEOMAwGA1UECxMFRkVJREUxFTATBgNVBAMTDGlkcC5mZWlkZS5ubzElMCMGCSqGSIb3DQEJARYWbW9yaWEtZHJpZnRAdW5pbmV0dC5ubzAeFw0xNDA0MTEwOTM1MTBaFw0zNDA0MTEwOTM1MTBaMIGEMQswCQYDVQQGEwJOTzESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVbmluZXR0IEFTMQ4wDAYDVQQLEwVGRUlERTEVMBMGA1UEAxMMaWRwLmZlaWRlLm5vMSUwIwYJKoZIhvcNAQkBFhZtb3JpYS1kcmlmdEB1bmluZXR0Lm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UtSny6D+DRQzdjWOdd+eQZxa9aKrx/v70Uo+yvnzgenLLS+MsUxbiSLkAPIbkWOO2kLdG9XSZ9sp9S5aGYMnsarxeGEXV1AS6olrpo5QJOZoQStFB0dYEXzBSJifTIsEmyXByd8mE64dkMcdzG90eBzfcFNwU6vKjln0vmoDocJrKZvUoF7d1egD+aUa9o3BneMDylcp8mkCe6XcnPlJ8QqxQ/RBmaly/Hl/zTZei8+pEu7ICRiorD2iHEDM/EhsclOrMKiRFBuZN8yB4sgknhdmAiWRyB/D4CEj74MQDQPp7Mr1B0Vxn7Y7ZeStt19HxEjzxyJGsdC9BMrn+tzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBwZmzNzTgbYAuQGikkRbKInog5OCMo3GhZO82+IrtasJC6rNPrz/+8KHfIOUB83wnfEMnKKygW7ELeSnvlbKUyve6DbNXrHjMJYzjqLG3cdgIKZaFyTfWaQiY8G82qP38Lc7rtgLoh/F7lpqCdunzPfSQBraGH2IAHyP6x3tjlsGGTj/LN8sT20iHRk8IXsBsMGv5DcZ4n+zB2E5hyfxH87sNYu6gaIrpcxcv5N0AK++fvpnrhlEmT0rW7b8wgBB4BmaPfCCb4DbDgHvIBPmG8QF7SNjUGuVPUFJRPTkvhighbeuRtoNpq0W1EVXKq0ZeBO8jJ6Si9LAdFvqwy70D0</ds:X509Certificate>
         </ds:X509Data>
@@ -430,10 +422,10 @@
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Feide</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">Feide</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Feide</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">Feide</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Feide - Norwegian Educational and Research Institusions</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Feide - Norske utdannings og forsknings-institusjoner</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.feide.no/introducing-feide</md:OrganizationURL>
     <md:OrganizationURL xml:lang="no">http://www.feide.no/</md:OrganizationURL>
   </md:Organization>
@@ -441,4 +433,8 @@
     <md:GivenName>Feide Support</md:GivenName>
     <md:EmailAddress>support@feide.no</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Feide Support</md:GivenName>
+    <md:EmailAddress>support@feide.no</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
index d2b25736..24b3bce5 100644
--- a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tut.fi/shibboleth2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.tut.fi/shibboleth2">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
@@ -25,7 +15,7 @@
         <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
         <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
         <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
         <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
@@ -33,9 +23,13 @@
         <mdui:DomainHint>tut.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -71,10 +65,10 @@ ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
diff --git a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
index d5eeaa17..8a09f2af 100644
--- a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
+++ b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infra.clarin.dk/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-10T20:41:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://infra.clarin.dk/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://infra.clarin.dk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN-DK-UCPH</mdui:DisplayName>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">CLARIN-DK-UCPH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</mdui:Description>
-        <mdui:Description xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
-        <mdui:Logo height="53" width="250">https://clarin.dk/clarindk/img/clarin-dk.logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="fi">CLARIN-DK-UCPH</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enables access to The Clarin center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
+        <mdui:Keywords xml:lang="en">CLARIN Copenhagen Humanities research language archive tools</mdui:Keywords>
         <mdui:InformationURL xml:lang="en">http://info.clarin.dk/en/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://info.clarin.dk/en/overview/privacypolicy/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>infra.clarin.dk</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=infra.clarin.dk</ds:X509SubjectName>
           <ds:X509Certificate>MIIDMjCCAhqgAwIBAgIJAOTsxgZuTQFoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
 BAMTD2luZnJhLmNsYXJpbi5kazAeFw0xNTAyMDQxMzUyMjJaFw0yNTAyMDExMzUy
 MjJaMBoxGDAWBgNVBAMTD2luZnJhLmNsYXJpbi5kazCCASIwDQYJKoZIhvcNAQEB
@@ -41,58 +36,48 @@ lJQ23OvirmG7uktfsvRSFlagZgz2CrYlj1mnwhrMBgQP6sY8+8839WPRlXZYfnDt
 UWS6MXXLxx0YNf34tYMAy87THE7+IVOWzjqJKZN7ES6rOsQkWhtG1LVvkLY0e1AT
 HUQ3NG7ubyG1oGFMYqHkJY83aZGgUxsKcS2TsAkY5iz42ZhnHTZUTiu9GXyYdKDj
 8Uh2QptwTDlncmuRJL64djt9iKmLL2dDm1K38WLjQn2NwbWtCD2jLX3CvF3z07qQ
-CnbRCoj2
-</ds:X509Certificate>
+CnbRCoj2</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN-DK-UCPH</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN-DK-UCPH</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Koopenhaminan yliopiston kieliportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Copenhagen Language Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelu tarjoaa paasyn Koopenhaminan yliopiston kielentutkimuksen materiaaleihin ja tyokaluihin</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider enables access to The Clarin center at University of Copenhagen and its services for language-based materials and tools.</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"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Administration</md:SurName>
+    <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Mitchell</md:GivenName>
     <md:SurName>Seaton</md:SurName>
     <md:EmailAddress>mailto:seaton@hum.ku.dk</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>CLARIN-DK</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:info@clarin.dk</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>CLARIN-DK</md:GivenName>
-    <md:SurName>Administration</md:SurName>
-    <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index c76aac8b..0018aae1 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.helsinki.fi/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
index 6ec82d1d..41f391cb 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openskos.meertens.knaw.nl/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">OpenSKOS | Meertens</mdui:DisplayName>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">OpenSKOS | Meertens</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf Simple Knowledge Organisation System Repository des Meertens Institut</mdui:Description>
-        <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</mdui:Description>
-        <mdui:Logo height="44" width="64">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja tarjoaa pääsyn Meertens instituutin Simple Knowledge Organization System Arkiston.</mdui:Description>
+        <mdui:Description xml:lang="en">This Service Provider provides access to the Meertens Institute\'s Simple Knowledge Organization System Repository</mdui:Description>
+        <mdui:Logo height="64" width="44">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities CLAVAS CLARIN OpenSKOS Vocabulary Service</mdui:Keywords>
         <mdui:InformationURL xml:lang="en">https://openskos.meertens.knaw.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>twww11</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
           <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
 BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
@@ -44,53 +38,48 @@ u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c
 M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
 6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/
 5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4
-1bxBV69YDJSB5BjVPA==
-</ds:X509Certificate>
+1bxBV69YDJSB5BjVPA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">OpenSKOS | Meertens</md:ServiceName>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">OpenSKOS | Meertens</md:ServiceName>
       <md:ServiceName xml:lang="en">OpenSKOS | Meertens</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf Simple Knowledge Organisation System Repository des Meertens Institut</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja tarjoaa paasyn Meertens instituutin Simple Knowledge Organization System Arkiston.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index ce97a6fe..8e67777f 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T11:34:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="no">UNINETT OpenWiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</mdui:Description>
-        <mdui:Description xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
         </ds:X509Data>
@@ -32,27 +12,24 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a set of wikis, as a collaboration platform across domains.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikiløsning, for samarbeid på kryss av organisajoner.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid: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.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
-    <md:OrganizationName xml:lang="no">UNINETT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="no">UNINETT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uninett.no/english</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="no">http://www.uninett.no/</md:OrganizationURL>
-  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Feide Support</md:GivenName>
-    <md:EmailAddress>support@feide.no</md:EmailAddress>
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
index 4f9c99e2..ecd37fa2 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -1,35 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:50Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">INL Portal - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">INL portal - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</mdui:Description>
-        <mdui:Description xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</mdui:Description>
-        <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</mdui:Logo>
-        <mdui:Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
+        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=portal.clarin.inl.nl,OU=InstantSSL,O=St Instituut voor Nederlandse Lexicologie,street=Matthias de Vrieshof 2-3,L=Leiden,ST=Zuid-Holland,postalCode=2311 BZ,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
 iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
 A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
@@ -60,46 +49,46 @@ wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
 ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
 JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
 EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
-zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==
-</ds:X509Certificate>
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">INL Portal - CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">INL portal - CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
     <md:SurName>INL</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>servicedesk@inl.nl</md:GivenName>
     <md:SurName>INL</md:SurName>
     <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
-    <md:SurName>INL</md:SurName>
-    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
index 8d9f438d..d6f444c4 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repos.ids-mannheim.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-02-08T13:14:47Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://repos.ids-mannheim.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://repos.ids-mannheim.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Forschungsprimärdatenrepository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Research Data Respository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</mdui:Description>
-        <mdui:Description xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</mdui:Description>
-        <mdui:Logo height="16" width="16">https://repos.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://repos.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</mdui:Description>
         <mdui:InformationURL xml:lang="en">https://repos.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://repos.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGHGxH2MWmjANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
@@ -63,38 +50,34 @@ Qac7iOiqrpszdbdXFtIVuZBWaZpeeei/0ZHNEzByrEIqCsgwrMat5CkjURt7uBLw
 T4i6DwZIlHs/RRr1euCJszIc25Pco/JCHf+UCNaWmXi8tWbM+RbvP14lGpgMqtEU
 2JPXOJVaUapaUeeWCx2WNpjvZQ3l7KIm3Mzz80P9gL3oMEkFZYkSaNjAV2AQwNoH
 6DYCJd/I407y24ykEwvD8HQjyERNEDJFz2P5IyH4kmsIOwXNQEoOhSFt/cvvSplt
-PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==
-</ds:X509Certificate>
+PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Forschungsprimärdatenrepository</md:ServiceName>
-      <md:ServiceName xml:lang="en">Research Data Respository</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - Repository</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Andreas</md:GivenName>
diff --git a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
index dc3a0b94..5c5d5cb3 100644
--- a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
@@ -23,9 +13,13 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -68,74 +62,74 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
       <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="CountryOfResidence" Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduCourseMember" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduCourseOffering" Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonCreditUnits" Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonECTS" Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonEPPNTimeStamp" Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonHomeCity" Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonPrimaryStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonProgram" Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonSpecialisation" Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonStudentCategory" Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonStudentStatus" Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonStudentUnion" Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonStudyStart" Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonStudyToEnd" Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="funetEduPersonTargetDegree" Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="jpegPhoto" Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="Nickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacCountryOfCitizenship" Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacGender" Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalUniqueCode" Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalUniqueID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacPlaceOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="userPresenceID" Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="userStatus" Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
index 70bcfe63..5471d360 100644
--- a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.huygens.knaw.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14:30Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://secure.huygens.knaw.nl">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="0"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Huygens ING (CLARIN Dienste)</mdui:DisplayName>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Huygens ING (CLARIN)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</mdui:Description>
+        <mdui:Description xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessä CLARIN aloitteen.</mdui:Description>
         <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
         <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
-        <mdui:Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -77,16 +72,13 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
-</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -138,31 +130,35 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
-</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Huygens ING (CLARIN Dienste)</md:ServiceName>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Huygens ING (CLARIN)</md:ServiceName>
       <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessa CLARIN aloitteen.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Support</md:GivenName>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
index 5e4536bc..443ad94a 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -1,35 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/DiscoJuice" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">BBAW - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">BBAW - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</mdui:Description>
-        <mdui:Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.bbaw.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bbaw.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</mdui:PrivacyStatementURL>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">German NLP tools from the BBAW/DWDS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">German NLP tools from the BBAW/DWDS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.clarin.eu/system/files/CLARIN_Service_Provider_Start-Up_Federation_Agreement_Final.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
 BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
 IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
@@ -61,93 +48,43 @@ M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
 jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
 5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
 gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
-WdNzDxmjE9EyFPvbQdfnOkE=
-</ds:X509Certificate>
+WdNzDxmjE9EyFPvbQdfnOkE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
-BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
-IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
-bG9naWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJh
-dy5kZTAeFw0xNDEwMTMxNTMxMDdaFw0xOTA3MDkyMzU5MDBaMIGKMQswCQYDVQQG
-EwJERTEPMA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xPDA6BgNVBAoT
-M0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRlciBXaXNzZW5zY2hh
-ZnRlbjEbMBkGA1UEAxMSc2hpYmJvbGV0aC5iYmF3LmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtciZovXzGD+K7C5bwgQl29CGss8jg8NoLco1C+h7
-REVbgOZo9ipf4OUoI8XieicXewor2hTF89Iy5nt/HuTQuKDW8q3edn+C/DNJgu4B
-0gmdZmZ+ubXcOd/1hnjRRLS9wxvgq2Q+mBLZwV8wMMJA/tEkO1xd0yGAysl4tcu2
-BcV/2SM+oI9rdWNuGK2m4lOsouEi0mIvm9v4aJBIfknOXm0cfC7xJB1fV5Q59gBL
-74PYTB99XKjQ3jVTzu3j1lOq9UgwbhYNXOiw2rWT2wY64LFAuNrk2j0tFnIIBLYM
-ws2DLo4AXOeDUR6TY5xWfMRg6rHEKYY8s/ggeEj5KG+HNwIDAQABo4ICMjCCAi4w
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTr7kmL7423Mx9V5mu8Ukx5vyME0zAfBgNVHSMEGDAWgBSMpo/xPxQ7ArX5J1RM
-qzyh2BuQmDAdBgNVHREEFjAUghJzaGliYm9sZXRoLmJiYXcuZGUweQYDVR0fBHIw
-cDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2Ev
-cHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmJhdy1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-YmJhdy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEB
-AIcuZcIEBKtbbf/OOTxBfEiZ2iGfu3kLO2QXYR5oqh6D7ZVjrjXfWjyCR6beFosY
-M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
-jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
-5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
-gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
-WdNzDxmjE9EyFPvbQdfnOkE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">BBAW - CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">BBAW - CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e209</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e209</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.bbaw.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.bbaw.de</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Wolf-Hagen</md:GivenName>
+    <md:SurName>Krauth</md:SurName>
+    <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Kai</md:GivenName>
     <md:SurName>Zimmer</md:SurName>
     <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dr. Wolf-Hagen</md:GivenName>
-    <md:SurName>Krauth</md:SurName>
-    <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Kai</md:GivenName>
     <md:SurName>Zimmer</md:SurName>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index a38c5b1d..071fb97a 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,63 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:53:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.catalog.clarin.eu">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://catalog.clarin.eu/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN CMDI Metadaten Anwendungen und Dienste - Katalog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN CMDI metadata applications and services - catalog</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Für die Component Registry, Virtual Language Observatory.</mdui:Description>
-        <mdui:Description xml:lang="en">For the Component Registry, Virtual Language Observatory.</mdui:Description>
-        <mdui:Logo height="220" width="195">https://www.clarin.eu/sites/default/files/clarin-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.clarin.eu/applications</mdui:InformationURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
+        <mdui:Keywords xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Keywords>
         <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
-SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
-aW4uZXUxHjAcBgkqhkiG9w0BCQEWD2xhdGFkbWluQG1waS5ubDAeFw0xNDA0Mjgw
-ODAyMDVaFw0xOTA0MjcwODAyMDVaMIGQMQswCQYDVQQGEwJOTDEMMAoGA1UECBMD
-R0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJLVBMMRMwEQYDVQQL
-EwpjYXRhbG9nIHNwMRowGAYDVQQDExFjYXRhbG9nLmNsYXJpbi5ldTEeMBwGCSqG
-SIb3DQEJARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA38nLf8TTeexrcqzfF5LOQ3F/9Tar+V7kNsLFUKO1ua6npX+4zgBu
-EYCm+hKrKDW09QN8yrBd+79a+slA4nCcpUymkh02rQhVbMpNiEQh8UFjqfaYv5fM
-R1OlgIWYXx2POdn60KbUYXIPGSrp2zQSXMFJMrnUOXHqxF8fxfTdbDEtcviXXwyC
-UjhXC4AJSLL/S8eftV8iioQDZMs5h1Kd95NVFsMhRC5MtD+iUyNsYR8X1PGaFg20
-bVg/Jg2eVNwPas49POr+HBOxk3BBtk8KwCAMwjCQUGL3zn7KeDLDFYsry/bWQtVn
-IbebSTysNhbrji3/VKnsPHiuOfCvYiqWEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQDTDfQr4wjJGAUo7os8PWTmKFkAH4D3oFQpxe4bvf6U9of4+fmE778S+WZc9kKs
-A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
-Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
-ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
-yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=catalog.clarin.eu,OU=catalog sp,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIDnjCCAoYCCQCIw16p56fGnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
 TkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzANBgNVBAoTBk1Q
 SS1QTDETMBEGA1UECxMKY2F0YWxvZyBzcDEaMBgGA1UEAxMRY2F0YWxvZy5jbGFy
@@ -77,51 +35,36 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
 Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
 ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA
-</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN CMDI Metadaten Anwendungen und Dienste - Katalog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN CMDI metadata applications and services - catalog</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Für die Component Registry, Virtual Language Observatory.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">For the Component Registry, Virtual Language Observatory.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual  Language Observatory (VLO) and more</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:clarin@clarin.eu</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Sysops</md:SurName>
-    <md:EmailAddress>mailto:sysops@clarin.eu</md:EmailAddress>
+    <md:SurName>Technical support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 3630ea5a..ae45d161 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,129 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:30:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.corpus1.mpi.nl">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://corpus1.mpi.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - corpus1</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Corpus linguistics and language documentation applications - corpus1</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Logo height="90" width="90">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
+        <mdui:Logo height="194" width="189">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
-YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
-MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
-BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
-9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
-eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
-VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
-kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
-DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
-kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
-kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
-t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
-uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
-FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
-vKRir2Cb6A/NaScKNHBBhg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=corpus1.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbDCCAlQCCQDcydJCAWzKeDANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRcwFQYDVQQDEw5jb3JwdXMxLm1waS5ubDEeMBwGCSqGSIb3DQEJARYPbGF0
-YWRtaW5AbXBpLm5sMB4XDTE0MDUwMjExMjkwNVoXDTE5MDUwMTExMjkwNVoweDEL
-MAkGA1UEBhMCTkwxDDAKBgNVBAgTA0dMRDERMA8GA1UEBxMITmlqbWVnZW4xDzAN
-BgNVBAoTBk1QSS1QTDEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwxHjAcBgkqhkiG
-9w0BCQEWD2xhdGFkbWluQG1waS5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMFrApun/KXB9YtFiT49PHz7uV9EoVmrFsCBNqVWYhM+msq2dkM7rNVe
-eZdy2hHID72ILMeqeXKX+hFQPyX18eN4L6lfJzzJJI2HGdIuGPyKZXCsVrCqnIWo
-VPRi5dnTlCpCEPhebt05L9TMQJrLWue2qDhhdwkaYrVfm+tsYGK9yiy3Gbsoa10L
-kEpd2oJZLDGHXSZJ6GL4oUMbQ+Z9bIjCelQWC4tU/u6qFGIzyoabaJbAlnFAxFSq
-DIQ9+27JObXMnVH/6iK0mhHTooB72Gd0LQHVHGiCrFyxmbhMp7tIX0vU3Qn4/U8F
-kt/Kep3+Wam/1h1NmmOJzTux2NuRurcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-YPPRnb1/92C/Si/V5I15TfFSTdOeMcVHQ0DY0ohUw8B4fEbr9htjZoW7Umyco5pF
-kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
-t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
-uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
-FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
-vKRir2Cb6A/NaScKNHBBhg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHFy/hnqc8wTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDI1MThaFw0xOTAyMjcxMDI1MThaMIGkMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEXMBUGA1UEAxMOY29ycHVzMS5tcGkubmwwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGbPWbCx1FfjX9sh831NEW6MHN
+VSd9DElQH+1eAqevdt5g6sLCK4HTsigUkl94MdiaLzDwVngYoJ/QwycncE0bFFxg
+H0YHs8URXAOfkO9RmKy4x6TkuYElF8AmBnnEhoF58O1b/0DG8TdSpmWsMBrw+lyB
+gV++v15+WjuHn4DdXbG3AaaUMNYWPSk4fIvjPX19U9ys0euYcKa/kTU8nFuOJzVy
+WmUyNWjcgwImszfwwKaumIGDHGKSJ9eME/idNczuUhihY/kgU30+x4yfQ0PPJ6y1
+YLd+E2xAOmbjEbBnytkbRPVxHAPqw0py80meld2s70Cxxklj739+oP+++PwhAgMB
+AAGjggI/MIICOzA5BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEE
+AYGtIYIsAgEEAwEwCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUE8+HM0pUcvXN
+4uBiDV/q2xwu2O8wHwYDVR0jBBgwFoAUAtYebgmrv1hlpwo8SDNh0c59w1swRAYD
+VR0RBD0wO4IOY29ycHVzMS5tcGkubmyCDGx1eDA3Lm1waS5ubIEbdG9iaWFzLnZh
+bnZhbGtlbmhvZWZAbXBpLm5sMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAGH5IPCi3tfYwo+CN357NdkGav1KQT2
+T0sjZ2chg//8SNucof42LXWvMlRIaRXjFP2bTW8sPt3hNwPyVLLAUFE/ogRz955Y
+a4Fbx/0bS1XZSCCneQ+pP+gnfad0AA3PJ2fDb/LUQ43q8xu8B1tm9GyTz6sE2mjU
+c0GOYUp4wvC/Hu3Wr1/80KbebBX5QxQPg9CVqXaz8yECpZwrTJsa3d+pY8WVA6Fr
+/0vQmp9LyYl9II3xrP5KMkLFWfusAqfDQbO+l0q44mGImEee3G4Wkg7VAcwDgKBa
+LHbuhlrBzMoxQBZGyW4eOToiuysyE37dSKtUgCs4vDN4S4EWz90Y6xY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - corpus1</md:ServiceName>
-      <md:ServiceName xml:lang="en">Corpus linguistics and language documentation applications - corpus1</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth</md:GivenName>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
     <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:corpman@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
index ab78262d..45933ebd 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.korp.csc.fi/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
         <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -63,8 +57,8 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
       <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -79,19 +73,13 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
     <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Krister</md:GivenName>
-    <md:SurName>Lindén</md:SurName>
+    <md:GivenName>Fin-Clarin</md:GivenName>
     <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Martin</md:GivenName>
     <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tero</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Jyrki</md:GivenName>
diff --git a/swamid-interfederations-2.0/sp.lat.csc.fi.xml b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
index 06377180..ce823d46 100644
--- a/swamid-interfederations-2.0/sp.lat.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.lat.csc.fi.xml
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.lat.csc.fi">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sp.lat.csc.fi">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lat.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">LAT – Language Archive Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
         <mdui:Description xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja käsitellä video- ja äänimateriaalia.</mdui:Description>
+        <mdui:Description xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</mdui:Description>
         <mdui:Logo height="41" width="100">https://lat.csc.fi/gif/LA.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://tla.mpi.nl/a4-guides/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -65,7 +59,7 @@ TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
       <md:ServiceName xml:lang="en">LAT – Language Archive Tools</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">LAT-palvelussa tutkijat voivat tallentaa ja kasitella video- ja aanimateriaalia.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">LAT is a user interface for language researchers to deposit and process audiovisual material.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -80,18 +74,18 @@ TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
     <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Krister</md:GivenName>
-    <md:SurName>Lindén</md:SurName>
-    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+    <md:GivenName>Tero</md:GivenName>
+    <md:SurName>Aalto</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Martin</md:GivenName>
     <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Tero</md:GivenName>
     <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:kielipankki@csc.fi</md:EmailAddress>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index c165bc61..52390543 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,34 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lux17.mpi.nl/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - lux17 (dev)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Corpus linguistics and language documentation applications - lux17 (dev)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics lux17 Service Provider for Linguistic Services aimed at researchers</mdui:Description>
         <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">Max Planck Institute for Psycholinguistics Lux17 Service Provider Linguistic Services</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
 TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
 LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
@@ -47,83 +36,37 @@ iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
 DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
 GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME
-</ds:X509Certificate>
+HFhkY9jzkGrcHMME</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=latadmin@mpi.nl,CN=lux17.mpi.nl,O=MPI-PL,L=Nijmegen,ST=GLD,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
-TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
-LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
-bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
-BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
-VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
-ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
-oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
-OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
-QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
-uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
-rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
-HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
-iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
-DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
-GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
-MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - lux17 (dev)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Corpus linguistics and language documentation applications - lux17 (dev)</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
+    <md:SurName>Technical support</md:SurName>
     <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index e19b11fb..0e84855f 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.utu.fi/sso-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
diff --git a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
index 9c9f236c..58385529 100644
--- a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
+<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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-10-24T14:14:51Z" registrationAuthority="https://www.wayf.dk">
+    <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:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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>
@@ -15,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <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>
@@ -23,20 +28,20 @@
     </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-POST" index="0" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="1" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.ait.dtu.dk/adfs/ls/" index="0"/>
+    <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: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 FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="gn" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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>
@@ -48,8 +53,6 @@
     <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</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:EmailAddress>tato@dtu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org-sp.xml b/swamid-interfederations-2.0/terena.org-sp.xml
index 1eca1234..32995ffc 100644
--- a/swamid-interfederations-2.0/terena.org-sp.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
@@ -1,93 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
-  <!--
-		This is a SimpleSAMLphp Service Provider Proxy for TERENA.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<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>
-          <ds:X509Certificate>
-						MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UE
-						ChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5h
-						Lm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEy
-						MTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgT
-						Ak5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UE
-						CxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG
-						9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfd
-						SPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azq
-						KOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN
-						+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLz
-						dciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwp
-						l9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqj
-						pKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3
-						fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQH
-						EwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYD
-						VQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0
-						ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoK
-						h6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7D
-						Hg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX
-						47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3W
-						AIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZ
-						p7XRy85jRjrvhahg5baIQ0u3aL8aMA==
-					</ds:X509Certificate>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UE
-						ChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5h
-						Lm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEy
-						MTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgT
-						Ak5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UE
-						CxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG
-						9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfd
-						SPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azq
-						KOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN
-						+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLz
-						dciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwp
-						l9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqj
-						pKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3
-						fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQH
-						EwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYD
-						VQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0
-						ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoK
-						h6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7D
-						Hg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX
-						47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3W
-						AIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZ
-						p7XRy85jRjrvhahg5baIQ0u3aL8aMA==
-					</ds:X509Certificate>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TERENA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TERENA: Service Provider Proxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.terena.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TERENA AAI Support</GivenName>
-    <EmailAddress>mailto:aai@terena.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>TERENA AAI Support</GivenName>
-    <EmailAddress>mailto:aai@terena.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 29034a4a..8b7b2688 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -1,53 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
-  <md:Extensions>
-    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-    </eduidmd:RepublishRequest>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://eduid.cz/uri/sp-group/clarin</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Repozitář a služby LINDAT/CLARIN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka</mdui:Description>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
+        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="29" width="29">https://lindat.mff.cuni.cz/favicon.ico</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Login" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -76,65 +48,40 @@ adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
 IhAZYQU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
     </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LINDAT/CLARIN digital repository and services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository and services of LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague, Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav formální a aplikované lingvistiky, Matematicko-fyzikální fakulta, Univerzita Karlova v Praze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Formal and Applied Linguistics, Faculty of Mathematics and Physics, Charles University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">ÚFAL MFF UK</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ufal.mff.cuni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://ufal.mff.cuni.cz/</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Straňák</md:SurName>
-    <md:EmailAddress>stranak@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative Support</md:GivenName>
-    <md:EmailAddress>lindat-technical@ufal.mff.cuni.cz</md:EmailAddress>
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index e3bce97e..aeb77325 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,116 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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 xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2008-03-28T00:00:00Z" registrationAuthority="https://www.wayf.dk">
+    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hi.is</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orphanage.wayf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viauc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drlund-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iha.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aip.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosur.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sska.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sss.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sikker-adgang.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regionsjaelland.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natmus.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosuc.cphwest.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dab.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">akf.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmi.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ism.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fbo.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fob.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsv.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuc.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kul.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ami.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfc.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stm.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vej.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsl.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zbc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frsgym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbs.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniit.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristne-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ikgym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmjx.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasseris-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apoteket.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kadk.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dtu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucn.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sde.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eal.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrs.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sceu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgtgym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odense.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">au.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knord.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vibkat.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vghf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucnord.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phmetropol.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucvest.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">handelsskolen.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphbusiness.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kea.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dansidp.stads.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bcsyd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusvejle.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rosborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhavnhs.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ah.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eamv.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aams.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <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">orphanage.wayf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
+      <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">aip.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">sg.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">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">ucsj.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sosuc.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">dmi.minibib.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ism.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">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">zbc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">cbs.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">ikgym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">vordingborg-gym.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">ucsyd.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">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">hrs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sceu.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">vgtgym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">odense.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">knord.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">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">eadania.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dansidp.stads.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>
+      <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">basyd.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fms.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>
+      <shibmd:Scope regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
+      <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>
+      <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>
@@ -118,14 +125,14 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
index 17eaf2dc..14fee192 100644
--- a/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
+++ b/swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml
@@ -1,97 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2010-06-11T09:42:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://weblicht.sfs.uni-tuebingen.de">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">WebLicht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WebLicht</mdui:DisplayName>
-        <mdui:Description xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
-        <mdui:Description xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/Main_Page</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/WebLicht_Privacy_Policy_Document</mdui:PrivacyStatementURL>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">weblicht</mdui:DisplayName>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=wladmin@sfs.uni-tuebingen.de,CN=weblicht.sfs.uni-tuebingen.de,OU=SfS,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGKzCCBROgAwIBAgIHF3iUXPRQADANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
-R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
-aS10dWViaW5nZW4uZGUwHhcNMTQwNDI0MTM1MTA4WhcNMTkwMjA0MDAwMDAwWjCB
-wjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJVHVlYmluZ2VuMR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgVHVlYmluZ2Vu
-MQwwCgYDVQQLEwNTZlMxJjAkBgNVBAMTHXdlYmxpY2h0LnNmcy51bmktdHVlYmlu
-Z2VuLmRlMSswKQYJKoZIhvcNAQkBFhx3bGFkbWluQHNmcy51bmktdHVlYmluZ2Vu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2KsTGSUCY/epaymY
-W3kqRl84RcNArc5w05x0rEi1qQUpAL1V7K7rJ/p5ZnjxqEhXEqYZXWh0ebkYWgzZ
-jr1Bs3mV1XVJ/9HrwRSFcNdyyFPmmP3Glsaculyn3zIQ4UcPyLk/kRlg37rx5nKj
-m3DZdrk345mjHO6MknFMSuh2TosI0tNhaa4rrRMJTlcOVJpiVlAF/DSZgwPjI6Yl
-5aHKes43tkCx1LJxDRAz9i/DaW4HdYNcwW3A0qlkRKRZqqVwRCG3Z5b9qdSry6t0
-UmmXMLYAxaStHVBx8d3eYWURfMLbvnpGKwWl0XGZQcevA9SzWswdmF/3X7zAmVAQ
-4L2qUQIDAQABo4ICbjCCAmowOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
-EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU9cQi9vwBJfcH9+Ae
-ytdTniex90EwHwYDVR0jBBgwFoAUsMG7aDV/4tZBnBpxr+D8QTTNw6gwRgYDVR0R
-BD8wPYIdd2VibGljaHQuc2ZzLnVuaS10dWViaW5nZW4uZGWBHHdsYWRtaW5Ac2Zz
-LnVuaS10dWViaW5nZW4uZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEKgQKA+hjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
-LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-TAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0
-dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGZ9bLdCBVw1Txf0f59QvfPe
-Ic02a/QJieoXre844zW5ISZwp14vGy+yzk4BK1tSovtxwf/FHiC7Uoqi+T9cL7E5
-yBbP2Y6cBHJuxy4YyXLimJoO7NWBDW+MOQRN1HjI5KXTMhhzmI81iofZbBlZwCSe
-pUzeHCt4KF3LDrrvNy4YiziDuojh23MHEv8W1/aNhX4F0T+MvwO2dGxAbax7XgLL
-ndO3/u6io4gRQiXZrrAS+1ZXGybrr6gUBN6popli1bR148tWwZNzwe1NjbGBIA5a
-ydKuf18CBYHeixW6XzkCMEdcRTec/qVTn7stpLtuuC5TCblNKGDKmhx9Mec+1Jo=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIED+vXfzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
+RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
+YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
+dWViaW5nZW4uZGUwHhcNMTAwNDE5MTMyNjA3WhcNMTUwNDE4MTMyNjA3WjCByzEL
+MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xKDAm
+BgNVBAsTH1NlbWluYXIgZnVlciBTcHJhY2h3aXNzZW5zY2hhZnQxDjAMBgNVBAsT
+BURTUElOMREwDwYDVQQLEwhXZWJMaWNodDEmMCQGA1UEAxMdd2VibGljaHQuc2Zz
+LnVuaS10dWViaW5nZW4uZGUxJjAkBgkqhkiG9w0BCQEWF2VoQHNmcy51bmktdHVl
+YmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJJ+lISL
+liCGHMdtC5EKdkSPkZIEfGf6u0I2YT+u/bX37XL4yOvmMxJxRLQM4oEvnE67n8k8
+4qe06B8xErFh3KqgC5Q5keUlQmXJu4wvABnk9AuxlwJKuGXI3PetBYfhid10A7Iu
+3Ki0s3j7+7yYTG6xXJt4qrE7rV/v79zBQcoKOwu1AMdfV9q8GRShEXCQ82P4IITT
+Q4z513p1e0mscDdBIunH6aThNCJA9rUBwEVX90HX5KHaOPSksHISylhjl/++XJFy
+/0wBpiZ4+7pN2S/go9J8A153NZSPhF2M5deyWgjT/K2LSudLnegIlRFTq1Kv89eE
+bF/ZaHuNvakbqQIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRmWkIAb3Vr
+zkTtELxvwSx4nngcUDAfBgNVHSMEGDAWgBSwwbtoNX/i1kGcGnGv4PxBNM3DqDAi
+BgNVHREEGzAZgRdlaEBzZnMudW5pLXR1ZWJpbmdlbi5kZTCBkwYDVR0fBIGLMIGI
+MEKgQKA+hjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNh
+L3B1Yi9jcmwvZ19jYWNybC5jcmwwQqBAoD6GPGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBrAYIKwYB
+BQUHAQEEgZ8wgZwwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
+Y2xhc3NpYy11bml0dWUtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwTAYIKwYB
+BQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2Ev
+cHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGxJyokA
+uUwUFzvszzutQNicSlWWHmrB6g63cRkbgBMsNGFwIyhrizCJtPYTDAbJ1lG2PrYj
+YpbhHR4892JIAm1IkyR4sJvAKXgnzNHtTy1ZTmlP7BjekPb6pcSRWAra84A+bOWY
++Q3KRITfEcUfsFw/PWYO8qwDurTWGBK3ReWkwLJ9y89XZDXQZt4A9RQnnBvnC7RU
+kLkAmxRV27neEuG8eh0tuFXStHuLbClnNnHaAt1c8m2awjWCWShG5cTR99muSJTc
+NGifdwt0qWax50ASplgOtT/GZAw2E7HEEgbDA+6JcKpVlh+UMnk2JN+nkkKUjgnD
+wN2yHSwHNNMiiGY=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">WebLicht</md:ServiceName>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblicht.sfs.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">WebLicht</md:ServiceName>
       <md:ServiceName xml:lang="en">WebLicht</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:ServiceName xml:lang="sv">WebLicht</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Web-based linguistic chaining tool.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e60</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e60</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Tübingen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Tuebingen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Zastrow</md:SurName>
+    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+    <md:GivenName>Thomas</md:GivenName>
+    <md:SurName>Zastrow</md:SurName>
+    <md:EmailAddress>mailto:thomas.zastrow@uni-tuebingen.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
index 2e117403..2e3ae927 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,62 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/shibboleth">
-  <!--
-		This is an "Emerald Insight" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+<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>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+    <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:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
-						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZ
-						NgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7
-						LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5Y
-						KFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4
-						acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178K
-						fsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQID
-						AQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRw
-						czovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						j3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+
-						F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B
-						0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu
-						01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193f
-						f50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGY
-						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
-						Bt7qcpd9uOc=
-					</ds:X509Certificate>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emerald Insight</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <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: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>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md: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-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
index 91ea9021..3d8e4e57 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
@@ -1,34 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:31:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zu den Meertens Institut Archive und ausgewählte Dienstleistungen für Geisteswissenschaften Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur..</mdui:Description>
-        <mdui:Description xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</mdui:Description>
-        <mdui:Logo height="135" width="200">http://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This SP regulates access to the Meertens Institute Archive and selected services for humanities research in the domain of Dutch</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyä Meertens instituutin arkisto ja asiantuntijapalvelut humanististen tutkimustoiminnan ...</mdui:Description>
+        <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities archive</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Meertens tutkimus asiakirjat kieli kulttuuri humanististen arkisto</mdui:Keywords>
         <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.meertens.knaw.nl,OU=I&amp;A,O=KNAW,L=Amsterdam,ST=NH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIF8TCCA9mgAwIBAgIJAPS1Y07BXsRDMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 VQQGEwJOTDELMAkGA1UECAwCTkgxEjAQBgNVBAcMCUFtc3RlcmRhbTENMAsGA1UE
 CgwES05BVzEMMAoGA1UECwwDSSZBMR0wGwYDVQQDDBR3d3cubWVlcnRlbnMua25h
@@ -60,57 +54,46 @@ KpxjeDWUTpopH0JEVvSgX0Tn9pVFVq5F4cial+yOpwDxZvAOwjJlWotoqnyVsDOn
 uESSSj1tVqW+2zqLTdzOpWaP0kWlu7wrL5PzqWhaPVChL+KYs40TNd2XK1rlOtNe
 WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
 MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
-SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
-</ds:X509Certificate>
+SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zu den Meertens Institut Archive und ausgewählte Dienstleistungen für Geisteswissenschaften Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur..</md:ServiceDescription>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN-NL Meertens instituutin</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-NL Meertens Institute</md:ServiceName>
       <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Meertens Institute Archive and selected services for humanities research activities in the domain of Dutch language variation and culture.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index 5746c2f4..9e63f017 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nordbiomed.net/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.nordbiomed.net/saml/sp">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
@@ -17,9 +12,13 @@
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.pdf</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIRANbySfQqDQ9zZ4V2aSBw+r4wDQYJKoZIhvcNAQEFBQAw
 QTELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUdBTkRJIFNBUzEeMBwGA1UEAxMVR2Fu
@@ -62,10 +61,10 @@ CAKgw6g9qQ==</ds:X509Certificate>
       <md:ServiceDescription xml:lang="fi">NordBioMed.net asiantuntijat kehittavat aktiivisesti kursseja biolaaketieteen alalle, taatakseen opetuksen laadun. Kursseja on mukana kehittamassa Karolinska Institutet, seka Ita-suomen, Turun , Bergenin ja Koopenhaminan yliopistot.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Nordic programmes of biomedicine have worked together in order to develop the field's teaching and quality management. This NordBioMed.net, comprising Karolinska Institutet and the Universities of Eastern Finland, Turku, Bergen and Copenhagen, is actively</md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Nordiska program for biomedicin har arbetat tillsammans for att utveckla  undervisning och kvalitetsstyrning. NordBioMed.net som  bestar av Karolinska Institutet, universiteten i ostra Finland, Abo,  Bergen och Kopenhamn, har aktivt utvecklat gemens</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
author	Leif Johansson <leifj@sunet.se>	2015-06-05 12:55:47 +0200
committer	Leif Johansson <leifj@sunet.se>	2015-06-05 12:55:47 +0200
commit	ad5533391ff5117a06d15a72d725ff4bb460a1dc (patch)
tree	9b18599b0c3488e9561bde6a8993524603e20b4d /swamid-interfederations-2.0
parent	f495fc32c4f6a39d4f8fb5827e09b4331449a8d5 (diff)