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

16 files changed, 588 insertions, 74 deletions

diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index c0536a90..f94a7cd4 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -11,6 +11,7 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml"/>
+<xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml"/>
@@ -59,6 +60,7 @@
 <xi:include href="swamid-interfederations-1.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.ids-mannheim.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.oeaw.ac.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/clarino.uib.no-.xml"/>
 <xi:include href="swamid-interfederations-1.0/clarin.phonetik.uni-muenchen.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
@@ -74,6 +76,7 @@
 <xi:include href="swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.feide.no.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.lut.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.metropolia.fi-idp.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml"/>
@@ -109,6 +112,8 @@
 <xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
 <xi:include href="swamid-interfederations-1.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
@@ -118,6 +123,7 @@
 <xi:include href="swamid-interfederations-1.0/www.clarin-pl.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.nordbiomed.net-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.ordbogen.com.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
new file mode 100644
index 00000000..16f3997d
--- /dev/null
+++ b/swamid-interfederations-1.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:41:26Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <saml:Attribute Name="tags">
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">denmark</saml:AttributeValue>
+      <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">iceland</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">WAYF Orphanage</mdui:Description>
+        <mdui:Description xml:lang="en">WAYF Orphanage</mdui:Description>
+        <mdui:DisplayName xml:lang="da">WAYF Orphanage</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WAYF Orphanage</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9v
+cnBoYW5hZ2Uud2F5Zi5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
+MCQxIjAgBgNVBAMMGWh0dHBzOi8vb3JwaGFuYWdlLndheWYuZGswggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe
+3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EU
+FS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS3
+6J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2
+qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL
+63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJ
+KoZIhvcNAQELBQADggEBABx+HHsDGyCHtfGNTudzmFRXilr0ay16wRgaLnsCTk3M
+HM2yOputyK+odkVdeIFQ+DnHvWcMOJDiXigiWbNVnN8qaFSHKCJ21Vj5peRpHY6a
+mtoI7FLHoi7t2w9+wmYW20Q4uEc75HrPkmbCn2wSAKDpZ9aBp7oS2KExU58DaLMn
+uxIsjo0ZuT1coH5F8+Pbz763uSbrA7S/c49K8/BZlFStp1419pB4FS+D8mX+ggeq
+Q2kElthI7N5bxzc5JrWQJJG8Vze/g3jvVr8m7p+FEpRjK22WPhfFtwislkYdDfUx
+I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/orphanage.wayf.dk/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="da">WAYF Orphanage</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">WAYF Orphanage</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="da">WAYF Orphanage</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">WAYF Orphanage</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="da">http://wayf.dk</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://wayf.dk/index.php/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>drift@wayf.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/clarino.uib.no-.xml b/swamid-interfederations-1.0/clarino.uib.no-.xml
new file mode 100644
index 00000000..2cb23e91
--- /dev/null
+++ b/swamid-interfederations-1.0/clarino.uib.no-.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://clarino.uib.no/">
+  <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://clarino.uib.no/feide/single-login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Clarino, UiB</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Clarino, UiB</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</mdui:Description>
+        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
+        <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://clarino.uib.no/iness/page?page-id=privacy_policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVp
+Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZ
+mm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiX
+DsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15fr
+hNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WCh
+sbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDW
+dy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8R
+piXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+dGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNz
+LnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx
+9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB8
+20waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60
+Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB
+7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7E
+zRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+zjWJ4F1vQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarino.uib.no/feide/single-logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarino.uib.no/feide/assertion-consumer" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Clarino, UiB</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvat CLARIN aloitetta.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.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:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Koenraad</md:GivenName>
+    <md:SurName>De Smedt</md:SurName>
+    <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meurer</md:SurName>
+    <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Paul</md:GivenName>
+    <md:SurName>Meurer</md:SurName>
+    <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index bd3c5114..59340ad2 100644
--- a/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -3,13 +3,13 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <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:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">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="en">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-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>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index d97fa342..d3bca761 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -52,6 +52,7 @@
       <shibmd:Scope regexp="false">bygland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bykle.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">cmi.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">danielsen-skoler.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>
@@ -138,6 +139,7 @@
       <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">gausdal.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>
@@ -239,6 +241,7 @@
       <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">lillehammer.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>
@@ -305,6 +308,7 @@
       <shibmd:Scope regexp="false">ovgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ovre-eiker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">oya.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oyer.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>
@@ -346,6 +350,7 @@
       <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">sintef.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/idp.lut.fi.xml b/swamid-interfederations-1.0/idp.lut.fi.xml
new file mode 100644
index 00000000..8e98b5a0
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.lut.fi.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.lut.fi">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">lut.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Lappeenranta University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</mdui:DisplayName>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>157.24.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>lut.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:61.06490,28.09240</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQXxAGKmjmI6A8/AokeEg6njANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNTAxMTYwMDAwMDBaFw0xODAyMjUyMzU5NTlaMDgxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmx1dC5maTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKVkLMT8SYz8D3lRDpfR5Idv
+vB6FJtmrKOgKsR8OH+cwkraeFIAfDzTHSBN/2hViYh0383NSpttIx21lQ/o6H7PE
+16VOTLyFaodMMGm4rSoyaqUxYREij1SZBrC+9d8UtxkAsM9saU0ef6I8MWPtPtod
+ZLVp3oCYCcOgrQ1mcVQBJBwG6zTKfIJiqyI7SQAoueBY7VcvR/NpUPHHneUi0qV/
+u5FO1Oh/0gtPes7rvr6KJX0A6X4TFobZKAKoiqUG8MJXSiyxd1TN5oVgDBrmumVN
+uHb4rSvsYGSZ2NoMAJlTC7p/i6va89bwMNsISPKiv0e+hv+HX9TiqyAVy23x5TUC
+AwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw/ba9MB0G
+A1UdDgQWBBRFT4PC6ScY7RZxNcbaU88KJtfbiDAOBgNVHQ8BAf8EBAMCBaAwDAYD
+VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0g
+BBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4Yp
+aHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmwwbAYIKwYB
+BQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20v
+VEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
+dXN0LmNvbTAVBgNVHREEDjAMggppZHAubHV0LmZpMA0GCSqGSIb3DQEBCwUAA4IB
+AQBRo6/qe5rTFpODjAPRbt/rLHebthMIfzYU1yVkfWZ1usiBD7brd08hyPvqjo6l
+btWNk3dgXXrCRH3u33X+HeBykZdYI03sFNnmT85QcYmrpYrGOujMGS9Wu5o0PYHV
+8TWMITsX9Vi9ADH/378KdHUyx0vH6EMvooY+FsL9Dz8pK9s17aCLKbnKEh49AWmE
+HXu+H5jgwuJsS8jvJTWo9E//iEx2M7YddnG3DKaxU4WhZ01Zy+lM0n7TIZOVC8pk
+UisE3gOCfuK9kEQKiQbQN/UBIx9xnY50fpTfplouzcoMzBd9LxU9k5Ir1X0rQ5g6
+CqEjXNP5Vdullr/akxI3IB8X</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lut.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lappeenranta University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lappeenranta University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.lut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.lut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Pekka</md:GivenName>
+    <md:SurName>Kuronen</md:SurName>
+    <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Antti</md:GivenName>
+    <md:SurName>Sirvio</md:SurName>
+    <md:EmailAddress>mailto:tunnusautomaatio@lut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
index cef613f9..ef381a32 100644
--- a/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
@@ -4,13 +4,13 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
         <mdui:Description xml:lang="en">University of Eastern Finland students, faculty and employees.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
+        <mdui:Description xml:lang="fi">Itä-Suomen yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
         <mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
index 9263cd89..3a11252e 100644
--- a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
@@ -4,9 +4,9 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
       <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Helsingfors universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Helsinki</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>
diff --git a/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
index ae45d161..02c807da 100644
--- a/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml
@@ -9,8 +9,8 @@
         <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:PrivacyStatementURL xml:lang="en">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>
@@ -20,37 +20,25 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <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: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>
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
index 32995ffc..449f6516 100644
--- a/swamid-interfederations-1.0/terena.org-sp.xml
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" 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>
+    <mdattr:EntityAttributes>
+      <saml:Attribute 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: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>
diff --git a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 8b7b2688..f9b68761 100644
--- a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
+++ b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -8,8 +8,8 @@
         <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
         <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
         <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -21,31 +21,26 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
-HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
-ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
-XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
-495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
-DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
-2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
-5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
-cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
-3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
-fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
-k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
-sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
-adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
-IhAZYQU=</ds:X509Certificate>
+          <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhM
+CTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzEyMTgwMDAwMD
+BaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA
+1UEAxMSbGluZGF0Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeKm
+DjOkone5YWIlKyQ1OeN9lgJ6yAiiiCY87Gl8o9773E1MCe8BqKF/whN9orwy54pznUFXK0kTxCVVXh
+VUJYqMt7w/PbY9su5x8RECYOUgHKXDVikovtTZYoQgwQNY56+C+t2TmSf1LYxEjArX4epGZ/Vy6HtKf
+Rw2xCvaj43Z3pUjqIf2d4GDM88C4Nece2HehkjDRJ099AMDnk2eK/zyoiGNFR2RLe06FvnoS0soVFAF
+7vr+4MjFHnJByCKgA0WYdIz/j7U+EqarX60Fvr8z58zK17pnB8JZAHd/qX2qJmu+JlIPYt4mBYXcsZ6
+3M0eLIHv9EBLqLXO5PQ3OGwIDAQABo4IBhzCCAYMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6
+pDjue0wHQYDVR0OBBYEFHy58QqIvxQw/MKvdVXYEfd5NMdrMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
+Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjE
+BAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1
+RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGV
+yZW5hLm9yZzA1BgNVHREELjAsghJsaW5kYXQubWZmLmN1bmkuY3qCFnVmYWwtcG9pbnQubWZmLmN1bm
+kuY3owDQYJKoZIhvcNAQEFBQADggEBAIxjYtINQkxYADOr/MqkSmNZzGi3VhmacPQuwfP7qwi5vWZyP
+6DXrlWgXDQorOfl6/RmLzb1LHwwyJdEUknCxU1AahKDsyG3fiSMOTD/t21RI9mbTCA1rtk0d4nXdJ3b
+KCb0dccRmt5CwbScCQfjsIjWvdkxoMlVIe6DgoqUlLILqSk/drjKpKGOYMZuPXS8zgNeEFw6XzWMKS
+gkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7mfwH8VeBwoL+rL1n6xqndwwqA
+nzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7btiALZ/UygiLnb3oX/q0Q=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
new file mode 100644
index 00000000..1af32e7c
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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:mace:feide.no:services:no.uio.galaxy-test">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-15T13:47:32Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.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">norway</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Galaxy Bioportal UiO test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Galaxy server at UiO</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIICbTCCAdYCCQDXiijSZIJdujANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJO
+TzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwEVVNJVDELMAkGA1UECwwCVkQxGzAZ
+BgNVBAMMEmdhbGF4eS10ZXN0LnVpby5ubzEkMCIGCSqGSIb3DQEJARYVbi5hLnZh
+em92QHVzaXQudWlvLm5vMB4XDTEzMDExNTEwNTAwM1oXDTI2MDkyNDEwNTAwM1ow
+ezELMAkGA1UEBhMCTk8xDTALBgNVBAcMBE9zbG8xDTALBgNVBAoMBFVTSVQxCzAJ
+BgNVBAsMAlZEMRswGQYDVQQDDBJnYWxheHktdGVzdC51aW8ubm8xJDAiBgkqhkiG
+9w0BCQEWFW4uYS52YXpvdkB1c2l0LnVpby5ubzCBnzANBgkqhkiG9w0BAQEFAAOB
+jQAwgYkCgYEAxhQJULqEK0BwR7N5r1VYHj1ZiGREBT9msBDDmMvU1p1UqWIUmLRy
+I/1pn775zdl9qjCQ7VTFjp3SkdZiEnjR4wOyFjpQzs/yneu3SAoFF/tRKrFoTgvt
+jGOb3VDmKHGr1Ygb6wDMoit9rAXD+gM7sjO6TDU1C4l+E2Dk3lUln4UCAwEAATAN
+BgkqhkiG9w0BAQUFAAOBgQCqryzoZSredMYi1vLz6jg0TD9WdedYqVFdKWsmfxsb
+434A6SMEWkt3ql4s1bH3UD9IjK/+KuviVyka3pj3LW347bFOm2sEwwvVHGlAXbzx
+ZFql6Vk1Bc+qGGOsgTK4pM3Xq/etRr0Fjp52YllAQC8DYEbo/UWf0HWGYLPTc4bb
+Ag==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://galaxy-test.uio.no/user/logout_feide_user"/>
+    <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://galaxy-test.uio.no/user/feide_auth" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Galaxy Bioportal UiO test</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Galaxy server at UiO</md:ServiceDescription>
+      <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: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" 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" 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.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="givenName" 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.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nikolay</md:GivenName>
+    <md:SurName>Vazov</md:SurName>
+    <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
new file mode 100644
index 00000000..c4f54fe2
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-08T12:37:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.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">norway</saml:AttributeValue>
+    </saml:Attribute>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+          centralized repository of a wide range of language technology tools, all installed on a high-performance
+          computing cluster.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
+      <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+        centralized repository of a wide range of language technology tools, all installed on a high-performance
+        computing cluster.</md:ServiceDescription>
+      <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: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" 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" 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:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" 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.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nikolay</md:GivenName>
+    <md:SurName>Vazov</md:SurName>
+    <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 348d8463..1057424e 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -34,7 +34,6 @@
       <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sikker-adgang.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>
@@ -48,13 +47,11 @@
       <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">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">kadk.dk</shibmd:Scope>
@@ -79,21 +76,20 @@
       <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">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">statsbiblioteket.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fms.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">msk.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">simac.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">this.is.not.a.valid.idp</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>
diff --git a/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml
new file mode 100644
index 00000000..33fde50d
--- /dev/null
+++ b/swamid-interfederations-1.0/www.nederlab.nl-shibboleth.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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.nederlab.nl/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://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Meertens Institute Nederlab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Meertens Instituutti Nederlab</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyäNederlab tutkimusympäristö</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 Nederlab</mdui:Keywords>
+        <mdui:InformationURL xml:lang="fi">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">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>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYDVQQGEwJOTDEWMBQ
+GA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVyZGFtMREwDwYDVQQKDAhNZWVydGVucz
+EMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3Nlc
+nZpY2VkZXNrQGtuYXcubmwwHhcNMTQwNzE3MTIxMDUzWhcNMjQwNzE0MTIxMDUzWjCBmDELMAkGA1UE
+BhMCTkwxFjAUBgNVBAgMDU5vb3JkIEhvbGxhbmQxEjAQBgNVBAcMCUFtc3RlcmRhbTERMA8GA1UECg
+wITWVlcnRlbnMxDDAKBgNVBAsMA0kmQTEYMBYGA1UEAwwPd3d3Lm5lZGVybGFiLm5sMSIwIAYJKoZIh
+vcNAQkBFhNzZXJ2aWNlZGVza0BrbmF3Lm5sMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+23RweYXXwA9mGVNYCpfxOOMcHGsGjCB/rdCHJ9REW3fmdmKn3Rtm9jxI3W/3AneMuE4s+QUog3ec2+i
+HuOvSYFZxSNybqaqZMSTB2IddNPoQiaWV/NNQXC8Cl/BBdCal3TM82R6HgfL3cSFcbq9JPIrhTeRfU
+9QhO7guGKooZGd/emC5GgM4iXowI+UenTHcPVj2eEpCEvigOzBYxY9S9u2nyV26sROTLKRTu8q+uZ92
+YmDbL07oqhmVX7LAjanO/0PcG6Cvhv5m57vyEt4CwzsfmqBswSQSPBSUXRCOeRXh6dvU2Zg2+9+gS4D
+1VjWDRuSjibQV5BvvbtRe6aVm4TC6llySlKw/+WQHKiJF6JgLK8vCg8PWlVPRDskCMEa1z/uwdN4aIb
+43xsyu6RzzDti5Qjgiy3dMK7ARrIKoByF289lw9PR2w6/YGiefgzdp5DVSM6XSax6+4MnpQhd9FrnI
+aW16bvErETJIV8folcTivazGf6pA9/5esJCzZjr4cxAkC22HysNsVHVZpdp+6oqGObeOQ9YflT/0Mp3
+jZbzANAXHADZCLmqO0pqb8xC5gpd1ITvIWIndgy8M2BWz+QtEFVK4Vf/ynjaOp6e+ZFrszdne/d8VRR
+pUnFpDOHsGsi6uuT/3N13WjQmEYNxOfCSTIkIAwi8mVQbhD5ARy48CAwEAAaNQME4wHQYDVR0OBBYEF
+PU7oll5Mreed7gM0ubxwNxhJWb9MB8GA1UdIwQYMBaAFPU7oll5Mreed7gM0ubxwNxhJWb9MAwGA1Ud
+EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACaAhHAW5xNKt9bjOBk3Sr5Tj0x5puRozg+B5RgNQi
+WR8PIBMCgn1RPGHKXHKbNP4M6b/MWXsmo5VBBcv4ofZW2jlwnonu0baKHNpxhV4xbF1oYicGHN25Uw/
+VbJFljCHOGy2k+UFpSHAOm0kp67wYo/4p7yy4oq5twu1tPDlURwlOcjA8g/2m1ym2j3pNLcyKKWhvzU
+zUvq4SM3IHZ8RR0OLwBBim7kAW6/jydmTX8/EVgFnwh1gkWm5w01ok+5Zy+NhMeqpFixL848pLmOdh8
+L7r4RYbmD8iQKrBgI8dpVTtZLgkEfh3IsDB9vwwyEqkdRXTwLLxCnjyEapp1s13mTjo86Fx6jL0V2b
+WOEZiQqFObmI1GJOqCwx9Fiot5zyUpZ9cTTOufwo5dsL4SLpuDPXCOcgZ7PZn7P9mTNyK5bm454f/Y4
+lYVZyOLp0hUVrKkXSdOPap2QqO5Hcui6wvCMENKaZrP4VckqI0UohXM40SjP5Q9f6od6NevvBBg2R/7
+amAkXXm/MtGEpYtauZZp/XvBWEw3UanLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8
+k981I4u1gBoEGD728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
+7Hwjg9MqBq4i</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Meertens Instituutti Nederlab</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute Nederlab</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja saatelee paasyaNederlab tutkimusymparisto</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</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="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>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="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-1.0/www.ordbogen.com.xml b/swamid-interfederations-1.0/www.ordbogen.com.xml
index db7a8295..3fa5a3e5 100644
--- a/swamid-interfederations-1.0/www.ordbogen.com.xml
+++ b/swamid-interfederations-1.0/www.ordbogen.com.xml
@@ -29,6 +29,7 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/SingleLogoutService.php"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ordbogen.com//singlesignon/simplesamlphp/saml2/sp/AssertionConsumerService.php" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lemma.com/wayf/response/login" index="1"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Ordbogen.com</md:ServiceName>
       <md:ServiceName xml:lang="en">Ordbogen.com</md:ServiceName>