Merge branch 'master' of md-master.swamid.se:swamid-metadata

51 files changed, 1828 insertions, 213 deletions

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index f67ed1c1..b11d9fd4 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-03-14T10:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-03-23T12:17:02Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index 0066394d..2ba4692c 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -6,6 +6,7 @@
       <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">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>
@@ -55,6 +56,7 @@
       <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.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>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 30ab841d..f0608e9a 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -158,6 +158,7 @@
       <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">itcn.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosunord.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">mf-gym.dk</shibmd:Scope>
@@ -166,6 +167,7 @@
       <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">vucnordjylland.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">bcsyd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">wayf.dk</shibmd:Scope>
       <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-2.0.mxml b/swamid-interfederations-2.0.mxml
index 14342e17..c8aaac90 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -80,6 +80,7 @@
 <xi:include href="swamid-interfederations-2.0/febe.ufpe.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/federacao.uvanet.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.redclara.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it.xml"/>
@@ -116,28 +117,35 @@
 <xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.canarie.ca.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.capes.gov.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.company.ja.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.condorcet.be.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.csc.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dante.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dfn.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dir.garr.it.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dit.ie.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dkit.ie.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.feide.no.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.georgikon.hu.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.heanet.ie.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.hig.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.hslu.ch.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifc.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br.xml"/>
@@ -245,11 +253,13 @@
 <xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz.xml"/>
@@ -282,6 +292,7 @@
 <xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml"/>
 <xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.siropglobal.org.xml"/>
 <xi:include href="swamid-interfederations-2.0/sso.utu.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/store.lu.lv.xml"/>
@@ -292,6 +303,7 @@
 <xi:include href="swamid-interfederations-2.0/terena.org.xml"/>
 <xi:include href="swamid-interfederations-2.0/test-adfs.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.federation.renater.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/theia.unifei.edu.br.xml"/>
@@ -310,6 +322,7 @@
 <xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/webinar.nordu.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblogin.dante.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblogin.uu.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz.xml"/>
@@ -329,5 +342,6 @@
 <xi:include href="swamid-interfederations-2.0/www.scran.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.videotorium.hu.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vutbr.cz.xml"/>
 <xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
index 21b19027..f8cef485 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.uzh.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-09T07:49:06Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-14T13:20:19Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -80,6 +80,42 @@ GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFNjCCBB6gAwIBAgIUBATM4TCBtgHL7TTLYLT51WgCtTAwDQYJKoZIhvcNAQEL
+BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
+BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMxNDExMzUw
+NVoXDTE2MDMxNDExMzQ1MFowgckxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsr
+BgEEAYI3PAIBAhMHWnVlcmljaDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkx
+EzARBgNVBAUTCjE4MzItMDktMjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVy
+aWNoMRAwDgYDVQQHEwdadWVyaWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVl
+cmljaDEXMBUGA1UEAxMOYWFpLWlkcC51emguY2gwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCiiuVzv5VrRVKDKd5wGJmA+nMY/qi1Pp4qpPM4l//BhAgK
+JPWyLqybIouWSMT2YKB0HITnPm3p7iJtzMtn7YZxK5wBqYenemFJptVUuS9jHzpq
+I3blM8TKUAoTY4b+Mppgj3njtM77a4YiMqEgSnTkPatEQ5QP0g+IOEI8I67FPXCu
+m+N/EDrviVB055ZEo2W2MTJxgTzRf+dpyoOvt0aVYlsKFcXxHiIfxJxufiO5aKgR
+0e/6lSjrOqhsQ+ZFtT6RkmiW2Oidplwo97B6uIh6Fhp/O7EixF8wN3UWMCWiRqh6
+V6VLOc73rK9hE3nnhF1N+UEowvJ8pVV5EoC2tXoVAgMBAAGjggGPMIIBizBzBggr
+BgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6Ly9vY3NwLnF1b3ZhZGlzZ2xv
+YmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
+LmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQG
+CCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0
+b3J5MBkGA1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD7
+8N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRp
+c2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFPdmvpYTb49/qkMzUnCN
+CHZqecp4MA0GCSqGSIb3DQEBCwUAA4IBAQBkxNx/LPp/L2FQRJE4XCHrH1f2LR2e
+BZsuBFBmNdAiXxNABZN/NIup7ADTTalALkY9qb0p7sYZOZ/P0mCIaQm4jrE4lXfC
+hW2bIAiqhmhW96Vg1tQt/hJdXOGwK9DgFM2VUfSrKt8MRRWpa/INWJWQIWsn1vZj
+DLrUq69KTMpWStYH/5ChSvbU6TRKRFp24y1OeMdBAP4kJZJoyocDmj3HCvz8VaSl
+kJTDI4IAgCLhzTnk7ljJI3qhaU7F9tp6iclLPcb/h3Zmzq8+cEPbRuXgTnmbSKX0
+o0HpMPl4e0ANFrH5CpAebxkqLtX1zryAm/Pi5wtxEqKwRv+3gUTol02q
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net.xml
index 0ce9e58e..9b3c0675 100644
--- a/swamid-interfederations-2.0/box-idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/box-idp.nordu.net.xml
@@ -9,6 +9,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/cafe.on.br.xml b/swamid-interfederations-2.0/cafe.on.br.xml
index be8fd3c1..39978e74 100644
--- a/swamid-interfederations-2.0/cafe.on.br.xml
+++ b/swamid-interfederations-2.0/cafe.on.br.xml
@@ -23,27 +23,27 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxHjAcBgNVBAoTFU9ic2VydmF0
-b3JpbyBOYWNpb25hbDEeMBwGA1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4w
-HAYJKoZIhvcNAQkBFg9sdWlzcmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMR4wHAYDVQQIExVPYnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYT
-AlJKMRMwEQYDVQQDEwpjYWZlLm9uLmJyMB4XDTEyMDQwNDE0NTgxMloXDTE1MDQw
-NDE0NTgxMlowgbsxHjAcBgNVBAoTFU9ic2VydmF0b3JpbyBOYWNpb25hbDEeMBwG
-A1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4wHAYJKoZIhvcNAQkBFg9sdWlz
-cmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQIExVP
-YnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYTAlJKMRMwEQYDVQQDEwpjYWZl
-Lm9uLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwf+EBoN18wPX
-u0YIb8MXg9Ra6i7Amo8PH73yVhHPAobRlI4KT3OddCC26lKHQkBFu4/tkohiGVvJ
-3UUeVeq5zv79z5FuPPy2xPzzNXSeoim3pen7V5iAIWn12TmWbEo6GuDv5JYFqrUh
-pX+CgWdR/I0olp+KQ9dS+atbCSknH6yotk72cePQEyvkQQMsEd8VBr50UqbkM9SX
-+AGk6+q4Ssh4A9gfCYaB0syQY8UDApK8TwN8SiHilxje41EPsFomHww4MvqEEIzB
-+gfiNG5ZV+hJjzfpNX5Q43Iwu7Alv4nGxl287roafRCi9/GmGwBRzQVVhRterhEp
-tMssMn36swIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3vZpO/+aiU9ShgjyZgWqY
-wcM3fLgslPfKUZe1Eq2wPjHFXs2VKtpwMi9Xd/ZrLhM4ttYmfnjKDaMxTFuXIXVx
-cCUEo2AJMGa+MzB61Q89V6U0+pvcqRoOyxIXsJoofk78xV1PW97t1Mub4tsaeT5y
-bG0i2MZEMGpw7LGBxDJei0J6/uv1iwMEcKicKWsiEHIb8/9QvkKubQRBdbhDcPD2
-k4KqxZCcraWfq/ppLVN7zESQiA84fSi5EhD9d5otvvEV2QOTVCUEVxkiLa/APs0B
-d3ISnBX1thKejlmBkep6rr5KAQV474rv/zYmbQVTlvFkQJxId7mDKd+IJy+TRRiA
+    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,28 +66,28 @@ d3ISnBX1thKejlmBkep6rr5KAQV474rv/zYmbQVTlvFkQJxId7mDKd+IJy+TRRiA
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxHjAcBgNVBAoTFU9ic2VydmF0
-b3JpbyBOYWNpb25hbDEeMBwGA1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4w
-HAYJKoZIhvcNAQkBFg9sdWlzcmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMR4wHAYDVQQIExVPYnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYT
-AlJKMRMwEQYDVQQDEwpjYWZlLm9uLmJyMB4XDTEyMDQwNDE0NTgxMloXDTE1MDQw
-NDE0NTgxMlowgbsxHjAcBgNVBAoTFU9ic2VydmF0b3JpbyBOYWNpb25hbDEeMBwG
-A1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4wHAYJKoZIhvcNAQkBFg9sdWlz
-cmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQIExVP
-YnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYTAlJKMRMwEQYDVQQDEwpjYWZl
-Lm9uLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwf+EBoN18wPX
-u0YIb8MXg9Ra6i7Amo8PH73yVhHPAobRlI4KT3OddCC26lKHQkBFu4/tkohiGVvJ
-3UUeVeq5zv79z5FuPPy2xPzzNXSeoim3pen7V5iAIWn12TmWbEo6GuDv5JYFqrUh
-pX+CgWdR/I0olp+KQ9dS+atbCSknH6yotk72cePQEyvkQQMsEd8VBr50UqbkM9SX
-+AGk6+q4Ssh4A9gfCYaB0syQY8UDApK8TwN8SiHilxje41EPsFomHww4MvqEEIzB
-+gfiNG5ZV+hJjzfpNX5Q43Iwu7Alv4nGxl287roafRCi9/GmGwBRzQVVhRterhEp
-tMssMn36swIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3vZpO/+aiU9ShgjyZgWqY
-wcM3fLgslPfKUZe1Eq2wPjHFXs2VKtpwMi9Xd/ZrLhM4ttYmfnjKDaMxTFuXIXVx
-cCUEo2AJMGa+MzB61Q89V6U0+pvcqRoOyxIXsJoofk78xV1PW97t1Mub4tsaeT5y
-bG0i2MZEMGpw7LGBxDJei0J6/uv1iwMEcKicKWsiEHIb8/9QvkKubQRBdbhDcPD2
-k4KqxZCcraWfq/ppLVN7zESQiA84fSi5EhD9d5otvvEV2QOTVCUEVxkiLa/APs0B
-d3ISnBX1thKejlmBkep6rr5KAQV474rv/zYmbQVTlvFkQJxId7mDKd+IJy+TRRiA
-                    
+MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxIzAhBgNVBAoTGk9OIC0gT2Jz
+ZXJ2YXRvcmlvIE5hY2lvbmFsMQ0wCwYDVQQLEwREVElOMRswGQYJKoZIhvcNAQkB
+FgxrYW50ZXJAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQI
+Ew5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxEzARBgNVBAMTCmNhZmUub24u
+YnIwHhcNMTQwMzEwMTgxMDEwWhcNMTcwMzA5MTgxMDEwWjCBpTEjMCEGA1UEChMa
+T04gLSBPYnNlcnZhdG9yaW8gTmFjaW9uYWwxDTALBgNVBAsTBERUSU4xGzAZBgkq
+hkiG9w0BCQEWDGthbnRlckBvbi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjETMBEGA1UEAxMK
+Y2FmZS5vbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMROHVXk
+EXBIpMbnBW0YSLczCP9rKrGpzhXvP/TmLy+cB/XPdsqEewNT+jCXrqDANL4qR2KL
+yPC2XS/ce+heyQG8aFgFuoyWSkupef9HR5LLq7NX5kvFG/iiYcJa0RGBn23rUudR
+MLP1HFn50htCjDbPV6zSyxt29J+8otWdoc7KeHOd50hq1Wcr+OdxyTQV4nXCxWsq
+6yy9mGg4SFo3csLepNs2IRI75uW+Wwq/zYRvvYJ2iBXC1Pcqw/xpAEepzquMJQQr
+hycQHBeSlmeNig7KRmX/gzTokaifcyXzz8inwvMSrSskkZEvuXO8j9H5QwAknfi2
+H8++d0LMUYaz5isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcY1w75rvSUZcTZq0
+MZvWHdSUhkE0RTbJgVVEiMOZMe/IViFNzh4RVFH3KWd/dOI9TL+hQLQ9MqdRCsvO
++9cj0vzf+0w8ZDbNB9EnSSRYFGSiYUilmZkPsK3FbuzsHgPFQRz4BJTvcu5WeJFH
+TFVaH7ESNc1aH+i7L8sApWBcJgpULtmdaIzK9Ipqva+5MLaCVKqU4vyhXfLg9LUa
+EdrSKYPZgsPA2cXQrKTg2BGpAE0cjEzQGh5L29JEpEixQjVLIaM2cLzEVpafZFc/
+mZGQjPivv0WXt2G/6594Gt3zwARJoqiPVGV7ppz8jQX5oQCVfSGXh4ztJsJYZLzM
+mncIMA==
+	
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se.xml b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
index 871b5ee3..f648a8b1 100644
--- a/swamid-interfederations-2.0/connect-beta.sunet.se.xml
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se.xml
@@ -7,6 +7,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-interfederations-2.0/connect.sunet.se.xml b/swamid-interfederations-2.0/connect.sunet.se.xml
index 5f4f2534..b2f84347 100644
--- a/swamid-interfederations-2.0/connect.sunet.se.xml
+++ b/swamid-interfederations-2.0/connect.sunet.se.xml
@@ -8,6 +8,7 @@
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/e5.onthehub.com.xml b/swamid-interfederations-2.0/e5.onthehub.com.xml
index 8f554887..48b68c2b 100644
--- a/swamid-interfederations-2.0/e5.onthehub.com.xml
+++ b/swamid-interfederations-2.0/e5.onthehub.com.xml
@@ -8,6 +8,7 @@
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
new file mode 100644
index 00000000..3da6cc0f
--- /dev/null
+++ b/swamid-interfederations-2.0/filesender.cesnet.cz.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">filesender.cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">FileSender</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sending files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro posílání souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://filesender.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://filesender.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQSNd+oblTGlgsZGtWhS41ojANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEgZVNjaWVuY2UgU1NMIENBMB4XDTE0MDIxMjAwMDAwMFoXDTE1MDMxNDIzNTk1OVowgYQxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmExEzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUZmlsZXNlbmRlci5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/2knUTg4ipWfMjhM0gyifCNfSxAsF+DYJfETNiUtQ9AIdTQL0qWKTtfDSYcrWo+TRUSNbQfZkT/joe0PKgcHiBLa3jKANQxPVSSiu+XZ2ckYRoWu+fmt3VjXZu8unyjQ5Uyh6vedJ/bcHw0r5ROYhSJu7+4jIQvdRec9ceVE7GgdVICPPUu4QL8pmrfKPN+y4hBznmSPbn2YknVrVdI6klkkj/mqBRLO4GVfPC1jGvZR8hjHF/U42pnaLbgk+UW811R9RwShd5SkyWr8rKF5CdhSucC5J/Upqwq0GlaKg1+H6i4+bxA6YeaqB1clmJiUi8n8zy785ThttSaBNHScJAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBQj05e9wNihlGGIDYW2zHWfyXk7kjAdBgNVHQ4EFgQUpDRUq9ul1wc8XpfXC7Dlj99/FxQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDAGA1UdIAQpMCcwDQYLKwYBBAGyMQECAh0wDAYKKoZIhvdMBQICATAIBgZngQwBAgEwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNybDB1BggrBgEFBQcBAQRpMGcwPQYIKwYBBQUHMAKGMWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMDkGA1UdEQQyMDCCFGZpbGVzZW5kZXIuY2VzbmV0LmN6ghh3d3cuZmlsZXNlbmRlci5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBAGS+5katUPWiBklQUKdgCLmy1RTg9P/aQUYgM6k43lJmTXbTE5N/5gL1fdTU2Dakla1mJ10tOAyoZX/wcPk+UXLMp13TsdopMLNGf5V+OQ3qRhlWKXNielx8+HfYJ3/d2rSAJ/ni3tEQfPd2LBvqFtLMyCnpU5A8nsD7DokJvw9tkieokxkGrx+BsW1zWPvmE1YUjhi8k4zF3+/0GZEJWbGdHPczAU9OM4Ei4LEIz2DAEGysWsudOsKWV3w95m7AJYpxB8J5qfNKqq8txmoY7r9b/Qycpglk526Y8WIVBvq8i3F1rImfR35s4vbBiEGcrQdeXQQ/9TGy9hWLsZS2lk8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-logout.php/filesender.cesnet.cz"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml2-acs.php/filesender.cesnet.cz" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
index 63d6ae17..9848bbd5 100644
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
@@ -49,13 +49,6 @@
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNVBAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jpbm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJEKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NBc81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0wCxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7xlHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vydml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwlqs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1yDQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWClHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw+cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLhHU+UDg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se.xml
index 2769678e..d3e4577f 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se.xml
@@ -18,6 +18,7 @@
         <mdui:Logo height="90" width="350">https://www.hb.se//PageFiles/41206/HBloggaSwamid.gif</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>hb.se</mdui:DomainHint>
         <mdui:IPHint>193.10.168.0/24</mdui:IPHint>
         <mdui:IPHint>193.10.169.0/24</mdui:IPHint>
         <mdui:IPHint>193.10.170.0/24</mdui:IPHint>
@@ -39,7 +40,6 @@
         <mdui:IPHint>193.11.71.0/24</mdui:IPHint>
         <mdui:IPHint>193.11.72.0/24</mdui:IPHint>
         <mdui:IPHint>193.11.73.0/24</mdui:IPHint>
-        <mdui:DomainHint>hb.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:57.724368,12.939918</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
@@ -136,7 +136,7 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
     <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
   </Organization>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Högskolan i Borås</Company>
+    <Company>University of Borås</Company>
     <EmailAddress>mikael.furth@hb.se</EmailAddress>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
new file mode 100644
index 00000000..fd2c2a23
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
new file mode 100644
index 00000000..621a9573
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net.xml b/swamid-interfederations-2.0/idp.aco.net.xml
index 6d8cf509..53d390a5 100644
--- a/swamid-interfederations-2.0/idp.aco.net.xml
+++ b/swamid-interfederations-2.0/idp.aco.net.xml
@@ -58,6 +58,7 @@ nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aco.net/idp/profile/SAML2/POST/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aco.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aco.net/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aco.net/idp/profile/SAML2/SOAP/ECP"/>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.dit.ie.xml b/swamid-interfederations-2.0/idp.dit.ie.xml
new file mode 100644
index 00000000..29a3f925
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dit.ie.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">dit.ie</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
+BQUAMBUxEzARBgNVBAMTCmlkcC5kaXQuaWUwHhcNMTAwNjIyMTExNTAwWhcNMzAw
+NjIyMTExNTAwWjAVMRMwEQYDVQQDEwppZHAuZGl0LmllMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs8xgb2mE8WJaUYR0fVcH8dEAS7f7bGWpyzrT+SPa
+v5egAD27fcuhUP+QFILf6plDW6YqXBcbymxHE1yPExVYO84v8lfpULEMbii1wRg+
+z/ywHqZ1Bio+aq8OrcCdjrlR84n3fpR/6aaVr21JbwVPR6+sCuc4+q3opXzaGGFa
+LvTT3hcl5C/cGiJQra81rlv9Q1dWwZh6xvmR5wrqzxkKiyJ8mr1KjuePyJV3BOJJ
+zeaki3SYdkB+xM8gO6P19lXkvsVYnkUWVR79E61mFReUWPzr9Bjub0A/aE2Pwzuq
+ZWPedEsVR4NfTZANVhewKCNFDadRDbRFDDRW9W2Lc2v3rwIDAQABo1swWTA4BgNV
+HREEMTAvggppZHAuZGl0LmllhiFodHRwczovL2lkcC5kaXQuaWUvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFF6EGb7A7x+2xLW/hEJHpulkdzkYMA0GCSqGSIb3DQEB
+BQUAA4IBAQA2kPu6oYpbBoldko99FX4ePbXa9ty11/I+EamddnzkAsLWsNd2JLQW
+R9wo+2vSkUzaxck11FMBS5hbqNsKdUjqTtscGP2MfmIiQJG+dgN7ThHKVvaxyTpc
+3JPQIvaew08s7L8ShjCuhkjmYmlOa4olGV1Z0aG7SjSI9b5w3MfDwN2lecAAUKVW
+N2vAFMBh3uxWVlSDbivRfNXflXOMYtDqAG1BPHff1UMArvYiSxxiVwM5tNBxmgZy
+N8bWLtABtkfUyrU6ay6E7h6qReHu30iU46r8xDyZkHjLa6iakvGjobWlTBTAF24P
+mANH8mJhMI+endx1YgUmOJJXylP/VAbC
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dit.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dit.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin Institute of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin Institute of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dit.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Liam</md:GivenName>
+    <md:SurName>Duffy</md:SurName>
+    <md:EmailAddress>liam.duffy@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>NOC</md:SurName>
+    <md:EmailAddress>noc@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tracey</md:GivenName>
+    <md:SurName>Roche</md:SurName>
+    <md:EmailAddress>tracey.roche@dit.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index f3b3a366..62202841 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -19,6 +19,7 @@
       <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">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>
@@ -68,6 +69,7 @@
       <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.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>
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
new file mode 100644
index 00000000..beee4668
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.fzu.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  </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 regexp="false">fzu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Physics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider FZU AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance FZÚ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fzu.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.fzu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://jiftach.cas.cz/loga/logo-fzu-40.png</mdui:Logo>
+        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-fzu-100.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
+ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/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 regexp="false">fzu.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAMXPvsGlLRsX7hPpMRUVsTPL9MPjMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcC5menUuY2FzLmN6MB4XDTE0MDMxMjExMDc0NloX
+DTM0MDMxMjExMDc0NlowGTEXMBUGA1UEAxMOaWRwLmZ6dS5jYXMuY3owggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmAUy5v5OguNKkfufBQPmszJ3GgMqf
+tFaLshqlu0D4IPwaHk76cXqMzp0l/tUMuhKyXxaQ1X/3cVPDJKkxqNCjE7etqnj1
+fz1FnRP/rJGpbacmAT2T3IqHKZpatJV6kbWxOOytOdJk4Uadmap4mAyHLISYyhpD
+sgWxcioFCsbtTPmM8GVKfj1IlnGYD19nKm7D9ocF5gCy9dbQZ/QyvOAd+jMDHGJ+
+n59nJD+GjwpdoDOB7agHhn7806Ui98lo8XK1SeSo47FFCMhwgeB59KjUzlySEEDv
+Zn8/HM3nJWQ54/ty/qknoWDnh2cNGLS2EdWCu9FNNGcfdJGg41ipvD0DAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcC5menUuY2FzLmN6hiVodHRwczovL2lkcC5menUu
+Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQfOSvunhqNoO2v13uWFsFu
+qYqDUzANBgkqhkiG9w0BAQUFAAOCAQEAjTGlMBUwRmH8nt9WDJSKaZU6rRcqY9Yi
+h+GrzpduiAz8WQcMD6ijUcOZuBRNpXZ5vOWPNtIWCoG8W7xxqRBVwROsczGaBQbf
+lo5uEzDGMVBh9tkqhwnXev1YbGai/K/frBQP5Ck1z9OAWwrGvlZnc1OM54ChKFYs
+TvwRI12g6UcV7OCIOc6Iq3xXMtP6H2A71KexofWNosrwMi7GMErnL3p8vc58akrs
+NE5wyp2MfieNYDfUsQsIUqAzYmrXHxfOJF7nPK1j8bcTZWCTcc0K3GAlL3MppJSn
+ZBbnqng3wtUIk0MVMjUGkG8j5FViFkmAI5Nxa6KUAtrrOu/LFh3nIg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz: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">Institute of Physics AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.fzu.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.fzu.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se.xml
index f3915543..de865cea 100644
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ b/swamid-interfederations-2.0/idp.hig.se.xml
@@ -13,12 +13,15 @@
         <mdui:DisplayName xml:lang="en">University of Gävle</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan i Gävle.</mdui:Description>
         <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="sv">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo height="94" width="83" xml:lang="en">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>hig.se</mdui:DomainHint>
         <mdui:IPHint>130.243.0.0/20</mdui:IPHint>
         <mdui:IPHint>193.11.48.0/20</mdui:IPHint>
+        <mdui:IPHint>193.10.163.0/24</mdui:IPHint>
         <mdui:IPHint>2001:6b0:23::/48</mdui:IPHint>
         <mdui:GeolocationHint>geo:60.6692,17.1191</mdui:GeolocationHint>
       </mdui:DiscoHints>
@@ -99,10 +102,22 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
     <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Gävle</Company>
+    <SurName>Network Operations</SurName>
+    <EmailAddress>nat@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Högskolan i Gävle</Company>
-    <GivenName>Network</GivenName>
+    <Company>University of Gävle</Company>
     <SurName>Operations</SurName>
     <EmailAddress>nat@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Gävle</Company>
+    <SurName>IT Support</SurName>
+    <EmailAddress>itsupport@hig.se</EmailAddress>
+    <TelephoneNumber>+46 26 648500</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.icpf.cas.cz.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
new file mode 100644
index 00000000..56897e44
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.icpf.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  </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 regexp="false">icpf.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav chemických procesů AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ICPF AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚCHP AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.icpf.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-icpf-44.png</mdui:Logo>
+        <mdui:Logo height="514" width="514">https://jiftach.cas.cz/loga/logo-icpf-514.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
+TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/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 regexp="false">icpf.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIULC7Xy9WFiq6Eyaj6NRjS1Y9Jt88wDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MB4XDTE0MDMxMDA5NDkwMVoX
+DTM0MDMxMDA5NDkwMVowGjEYMBYGA1UEAxMPaWRwLmljcGYuY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRPjpQTPympllXjrRtBYcrmWxIv+
+vUhf1o/CQTvfDfuSqVvPgudJSv74aUiTrF7T6PrUFqPsJTciWEQgMpxhkudh1GzI
+ALGrlRNAJ6CybJRfWwAgHtKEzNT2YcUSqwkLSTvUj6RKWaSxxtFWnhUHCrKEMyRU
+/XeHUmEu/eiy31dA14UReen3zbvGPcecSJ331HaT3hCvhzHUUvj21NxyHGmHu990
+w+JOnmuAmVMy7wp39qOaCT8baf5jqXHz6RiB7MHNB+lYoeeq6FsH0+Kx7/ITCNV5
+Rgu+i0e9xYHQeoDcoj+9M+KKKtc0kTaEAgrQShvC3s7RNmiT3IAmF5dvzwIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaWNwZi5jYXMuY3qGJmh0dHBzOi8vaWRwLmlj
+cGYuY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRL04il4DX4yVt2YRKw
+yn0RE+jvTjANBgkqhkiG9w0BAQUFAAOCAQEAU8gysmTVfqkh0LLJwGUaYxUN4UZM
+6X9YFsZ0scuhgx6lIbSuqA5Q/cmWlgkk1nnIQEEf5krQ7B/c/LW9SJVvJ2qI3+oy
+Do0R2kOsZJGbYQ86RePMWi/ZrTZ23YWWCEAd3d16t1vyoyPe7pUpUDcH5yMR+ox2
+wmaJjLwBh44Tq/Net8+VU5x1X1Odcm0gKxaUL3wMGkWcmu3TTFVGTW6dQqmk+9vH
+U8aayXh+GW8zLwLWXyJ7e/BcJDDrESDRCMuwNLC40wPec9yhurSX0i8zyVRU+GIy
+TZPDVBpoc7uJtaJLyV/fbDL246MVnkZFwfjs7PwGoHmWANWqpD7ztFH2LQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz: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">Institute of Chemical Process Fundamentals of the ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.icpf.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br.xml b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
new file mode 100644
index 00000000..9590a99e
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifc.edu.br.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifc.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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 regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFC - Instituto Federal Catarinense</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFC - Instituto Federal Catarinense</mdui:Description>
+        <mdui:InformationURL xml:lang="en">www.ifc.edu.br</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">www.ifc.edu.br</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xLDAqBgNVBAoTI0lGQyAtIElu
+c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHzAdBgkq
+hkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAPBgNVBAcTCEJsdW1lbmF1MRcw
+FQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmlk
+cC5pZmMuZWR1LmJyMB4XDTE0MDMxNDE0NTE0NVoXDTE3MDMxMzE0NTE0NVowga8x
+LDAqBgNVBAoTI0lGQyAtIEluc3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQww
+CgYDVQQLEwNEVEkxHzAdBgkqhkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAP
+BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
+BhMCQlIxFzAVBgNVBAMTDmlkcC5pZmMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraUtsB76JjKzQtx6QfkHSiDx5uw
+HTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GAzcBTuJskMbFFXOnfi33F8jBJ
+TodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqjeXOCrAzZEfBwdsxallOhle6m
+qr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u0NiRhgaT9E9WMj/wKrDVzs0r
+YkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Ylsu8G7kTdGyS0/CyABr9+FL8
+XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7ywIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQADX2xQkHlVaFQNGF/3ZpeGSPmoDqexhp8zqVewea3xibHGfeAZA3Ba
+jWkgmkP2N09lP2xxipxO2cZeWfUPxLI0caC/r5FTp/U+JrzXoGprC1Tw0bDonimG
+RToY9MOcPIoQcgScYTLo7ZhoTa2OXXUXF/0XL00uWDr5Emk+IJvhj1C4xovXabNK
+IHzmG/AQ06/CyfBK2jxo3JFucNnVxrL+1zKhMu11wxEsOoT3sBFNhkfzLngExNbs
+7x6/mPYJnJ8Vemd76Oui5ISEF8A3tfS0LjanFNz1I9kH9H9T/dESjgqcTWtw8ET/
+ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifc.edu.br/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 regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xLDAqBgNVBAoTI0lGQyAtIElu
+c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHzAdBgkq
+hkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAPBgNVBAcTCEJsdW1lbmF1MRcw
+FQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmlk
+cC5pZmMuZWR1LmJyMB4XDTE0MDMxNDE0NTE0NVoXDTE3MDMxMzE0NTE0NVowga8x
+LDAqBgNVBAoTI0lGQyAtIEluc3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQww
+CgYDVQQLEwNEVEkxHzAdBgkqhkiG9w0BCQEWEGluZnJhQGlmYy5lZHUuYnIxETAP
+BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
+BhMCQlIxFzAVBgNVBAMTDmlkcC5pZmMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAweLZ9PCMIFyNRZxpJraUtsB76JjKzQtx6QfkHSiDx5uw
+HTgiTQilQBJFCAlz2NQGlFH46zHGTemNS3S5J2GAzcBTuJskMbFFXOnfi33F8jBJ
+TodaCq2V9pGwdjTs3ebPKekDYCeHRPYwhBszPWqjeXOCrAzZEfBwdsxallOhle6m
+qr4mw2tFwx5k67X8kdwVpkFaNjGtUDMfltjhVy6u0NiRhgaT9E9WMj/wKrDVzs0r
+YkxthF6qh+FcoLIIwB9SenqtmiK9uAWhRje7LH3Ylsu8G7kTdGyS0/CyABr9+FL8
+XxJ2VKwIABWEvl6UoinY122zAy/uDxzk4qkq0ge7ywIDAQABMA0GCSqGSIb3DQEB
+BQUAA4IBAQADX2xQkHlVaFQNGF/3ZpeGSPmoDqexhp8zqVewea3xibHGfeAZA3Ba
+jWkgmkP2N09lP2xxipxO2cZeWfUPxLI0caC/r5FTp/U+JrzXoGprC1Tw0bDonimG
+RToY9MOcPIoQcgScYTLo7ZhoTa2OXXUXF/0XL00uWDr5Emk+IJvhj1C4xovXabNK
+IHzmG/AQ06/CyfBK2jxo3JFucNnVxrL+1zKhMu11wxEsOoT3sBFNhkfzLngExNbs
+7x6/mPYJnJ8Vemd76Oui5ISEF8A3tfS0LjanFNz1I9kH9H9T/dESjgqcTWtw8ET/
+ZJpfhNkwWB0T1yiNr4tEzM43Zs0gMhU6
+
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML1/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">IFC - Instituto Federal Catarinense</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.ifc.edu.br</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">www.ifc.edu.br</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Renato de Souza Muniz</SurName>
+    <EmailAddress>infra@ifc.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se.xml b/swamid-interfederations-2.0/idp.it.gu.se.xml
index 7e402db1..55d4a223 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se.xml
@@ -97,8 +97,21 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
     <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>University of Gothenburg</Company>
+    <SurName>Lena Ström</SurName>
+    <EmailAddress>lena.strom@gu.se</EmailAddress>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Göteborgs universitet</Company>
+    <Company>University of Gothenburg</Company>
+    <SurName>Pablo Millet</SurName>
     <EmailAddress>pablo.millet@gu.se</EmailAddress>
+    <TelephoneNumber>+46707104070</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>University of Gothenburg</Company>
+    <SurName>GU-Support</SurName>
+    <EmailAddress>support@gu.se</EmailAddress>
+    <TelephoneNumber>+46317862020</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net.xml
index 6236c27e..5bb03322 100644
--- a/swamid-interfederations-2.0/idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net.xml
@@ -9,8 +9,12 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">NORDUnet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">NORDUnet</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NORDUnet A/S Identitetsutfärdare används av anställda och gäster vid NORDUnet</mdui:Description>
         <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
+        <mdui:Logo height="46" width="203">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
+        <mdui:Logo height="46" width="203" xml:lang="sv">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
         <mdui:Logo height="46" width="203" xml:lang="en">https://www.nordu.net/resources/NORDUnet2.jpg</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -93,8 +97,18 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
     <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>NORDUnet</Company>
+    <SurName>noc@nordu.net</SurName>
+    <EmailAddress>noc@nordu.net</EmailAddress>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>NORDUnet NOC</Company>
+    <Company>NORDUnet</Company>
+    <EmailAddress>noc@nordu.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>NORDUnet</Company>
+    <SurName>NUNOC</SurName>
     <EmailAddress>noc@nordu.net</EmailAddress>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
index 8ab27c57..654aa93d 100644
--- a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
@@ -13,8 +13,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">ssc.cas.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SSC AV CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">SSČ AV ČR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Centre of Administration and Operations of AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Středisko společných činností AV ČR</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider SSC AV CR employees.</mdui:Description>
         <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance SSČ AV ČR</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.ssc.cas.cz/</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl.xml
index e5b548a0..50556de2 100644
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ b/swamid-interfederations-2.0/idp.umk.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.umk.pl/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-22T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz.xml b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
index a33939f5..9ae5630a 100644
--- a/swamid-interfederations-2.0/idp.utia.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.utia.cas.cz.xml
@@ -13,8 +13,8 @@
     <Extensions>
       <shibmd:Scope regexp="false">utia.cas.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UTIA AV CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">ÚTIA AV ČR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute of Information Theory and Automation AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider UTIA AV CR employees.</mdui:Description>
         <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTIA AV ČR</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.utia.cas.cz/</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/idp2.idem.garr.it.xml b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
index 5ea56e51..eec138f8 100644
--- a/swamid-interfederations-2.0/idp2.idem.garr.it.xml
+++ b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
@@ -20,7 +20,26 @@
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUGfIPvZIB9nBxDg54E03n7mjGIg8wDQYJKoZIhvcNAQEFBQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTAwNzE2MDg1NjI4WhcNMTMwNzE2MDg1NjI4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnNn42PX5oef6950FuQdMkNjvhZJ2VpDqAadw85P0vmDDVOR7KVomzqCknj5ssCKKblhDL+MdJjz/rv2HHNz1bbAaVjMCa08eXa4e+ywjg5Rtq0DyN6UaS5uHQ+NFrQX1QTusmPbHGpLHXLMZSMsdvOq3vSojc8WZfhn/uolvh/MunTmAUmJ0Xw2JoTtTTuHBmgJddt/wKEfaWICPm8p7GQx/UJZyqPiZmROT9IdJSSBKwKN4G9afn4TLW3vaj7BOvJDtLTMJmUWUMd+iGTvJQNCqp93d7VWpJH3LtChnc+pIn23vv4PkSddz0PsDIuz2ZkuEHLFgB2FCoLgMiFuHcCAwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8vaWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNtsYApKCvWauBEDlSwnVpH/0lyRMA0GCSqGSIb3DQEBBQUAA4IBAQB5o17LC3liNiqkZUJiUlIqsTGfHbi/jIhQHLCpkKfiHpNOCpb5YlOOH/29fYQj2rrU8E6Ohb8fWsFfT5sXQjaCOQyvY8lZTcZe3usUayYAIyGT/NuhKlPcK6f3fiDNhLtf8nzBzDc/Ms/r9y83P2AlUwFn8/vINYBk/cvxS7EzfPxA9xRiovjnx5f5Q65mYExzulY2Mjy84k67uQtqN0da+xGxphD0dPsxjyGCvCJa1B059z+t9/8pmdPCz84YMed6prKxA1TqEiL9iN3ezmSf6e7tsHf8BqLKORgT/7j3eDzPt2ThbKCHsVvJXon75ah+1zKcCj6SxkaSg6Z8B/oy </ds:X509Certificate>
+          <ds:X509Certificate>
+                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
+                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
+                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
+                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
+                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
+                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
+                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
+                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
+                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
+                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
+                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
+                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
+                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
+                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
+                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
+                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
+                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
+                            gh97
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -40,7 +59,26 @@
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLzCCAhegAwIBAgIUGfIPvZIB9nBxDg54E03n7mjGIg8wDQYJKoZIhvcNAQEFBQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTAwNzE2MDg1NjI4WhcNMTMwNzE2MDg1NjI4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnNn42PX5oef6950FuQdMkNjvhZJ2VpDqAadw85P0vmDDVOR7KVomzqCknj5ssCKKblhDL+MdJjz/rv2HHNz1bbAaVjMCa08eXa4e+ywjg5Rtq0DyN6UaS5uHQ+NFrQX1QTusmPbHGpLHXLMZSMsdvOq3vSojc8WZfhn/uolvh/MunTmAUmJ0Xw2JoTtTTuHBmgJddt/wKEfaWICPm8p7GQx/UJZyqPiZmROT9IdJSSBKwKN4G9afn4TLW3vaj7BOvJDtLTMJmUWUMd+iGTvJQNCqp93d7VWpJH3LtChnc+pIn23vv4PkSddz0PsDIuz2ZkuEHLFgB2FCoLgMiFuHcCAwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8vaWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNtsYApKCvWauBEDlSwnVpH/0lyRMA0GCSqGSIb3DQEBBQUAA4IBAQB5o17LC3liNiqkZUJiUlIqsTGfHbi/jIhQHLCpkKfiHpNOCpb5YlOOH/29fYQj2rrU8E6Ohb8fWsFfT5sXQjaCOQyvY8lZTcZe3usUayYAIyGT/NuhKlPcK6f3fiDNhLtf8nzBzDc/Ms/r9y83P2AlUwFn8/vINYBk/cvxS7EzfPxA9xRiovjnx5f5Q65mYExzulY2Mjy84k67uQtqN0da+xGxphD0dPsxjyGCvCJa1B059z+t9/8pmdPCz84YMed6prKxA1TqEiL9iN3ezmSf6e7tsHf8BqLKORgT/7j3eDzPt2ThbKCHsVvJXon75ah+1zKcCj6SxkaSg6Z8B/oy </ds:X509Certificate>
+          <ds:X509Certificate>
+                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
+                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
+                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
+                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
+                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
+                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
+                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
+                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
+                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
+                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
+                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
+                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
+                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
+                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
+                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
+                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
+                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
+                            gh97
+                        </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se.xml
index 9e3a3ffd..69f4a142 100644
--- a/swamid-interfederations-2.0/idp2.kau.se.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se.xml
@@ -9,13 +9,20 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kau.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Karlstads Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Karlstads universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Karlstad University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Karlstads universitet</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Karlstad University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
         <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo height="112" width="112" xml:lang="sv">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:Logo height="112" width="112" xml:lang="en">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>kau.se</mdui:DomainHint>
         <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
         <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
         <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
@@ -24,7 +31,6 @@
         <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
         <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
         <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
-        <mdui:DomainHint>kau.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
@@ -104,14 +110,22 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
     <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>webbteknik@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Scott</SurName>
+    <Company>Karlstad University</Company>
+    <SurName>Paul Scott</SurName>
     <EmailAddress>paul.scott@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Olsson</SurName>
-    <EmailAddress>magnus.olsson@kau.se</EmailAddress>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Karlstad University</Company>
+    <SurName>IT-avdelningen Karlstads universitet</SurName>
+    <EmailAddress>datasupport@kau.se</EmailAddress>
+    <TelephoneNumber>+46 54 700 2200</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br.xml b/swamid-interfederations-2.0/idpcafe.usp.br.xml
new file mode 100644
index 00000000..6d309e40
--- /dev/null
+++ b/swamid-interfederations-2.0/idpcafe.usp.br.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idpcafe.usp.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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 regexp="false">usp.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:DisplayName>
+        <mdui:Description xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
+        <mdui:Description xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.usp.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.usp.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
+T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
+cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
+Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
+IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
+TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
+CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
+7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
+wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
+NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
+kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
+Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
+WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
+ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
+kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
+4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
+QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
+7UdfUKFbnsb/9jdfwzk=
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.br/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 regexp="false">usp.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID+jCCAuICAQAwDQYJKoZIhvcNAQEFBQAwgcIxIjAgBgNVBAoTGVVOSVZFUlNJ
+REFERSBERSBTQU8gUEFVTE8xMTAvBgNVBAsTKERFUEFSVEFNRU5UTyBERSBURUNO
+T0xPR0lBIERBIElORk9STUFDQU8xGzAZBgkqhkiG9w0BCQEWDG51dmVtQHVzcC5i
+cjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJBgNV
+BAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xMzEyMTExNDUxMDNa
+Fw0xODEyMTAxNDUxMDNaMIHCMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUgU0FP
+IFBBVUxPMTEwLwYDVQQLEyhERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJ
+TkZPUk1BQ0FPMRswGQYJKoZIhvcNAQkBFgxudXZlbUB1c3AuYnIxEjAQBgNVBAcT
+CVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJCUjEXMBUG
+A1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCjjPbk1OaWxi3zboP0gRIDrAwmYvH7oe7np5DZ1DkOUEUZRPuSPrzMgT0u
+7lSi0Af9RyjYw/1rH1/d5y3U1qBVL7lxi/p2twaKS7BnHLieBIVpdCBqoImVSKGK
+wzhJZolh+Jt623BszlyFhO5DNFN1GY19e+geRwlg7XzRvihcVKJsphgjjMPWB33g
+NqgvkIzIAYjG8KqSfgEo6fYmhWlHHdIyrQZohSkMjZ28xGx5zylruEIgKWvmUMNE
+kQoAlB/Gp5rlccYnzyij8WjbDy7ymoh5znxVguWXPYq4c5DJuydgOC77VynruR4R
+Jdk/BFu0xcLg3FEwYSQq37dNKubXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIs0
+WO6KyOJ/xAW2UXTn8jOVKfDJGVjEz3AzR4ymQUoMp+TvshZyfUsecKla7DLDKxAe
+ec/+UH8IKDWF5FmGVpi38zmiCaz6QPrf4BZjCdVges1CkFpLwdZKE0lrLe26AU9y
+kimqlu5bTwUKxLkPayX1hrQdERVLDLgGpNxvuqRF414A7GufoLDuiaap9oFbyUnr
+4XXRj+T9rbE4/qPgleEnS9uR5ecNZIyZBcQh007Piygh8itK3XyfxTHGxGsD/Wim
+QRPX6jagdA+2Yl+IJOdCFckQMS+uuuHKNl390fHbQvvP+jvgDfKm2mB/GjgzqgR8
+7UdfUKFbnsb/9jdfwzk=
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/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">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
+    <OrganizationName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">USP - UNIVERSIDADE DE SAO PAULO</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.usp.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.usp.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>DTI - Departamento de Tecnologia da Informacao</SurName>
+    <EmailAddress>consulta@usp.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se.xml
index ac9f44be..68072b14 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se.xml
@@ -16,6 +16,7 @@
         <mdui:Logo height="146" width="292">https://kiidp.ki.se/images/ki_logo_292x146.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DomainHint>ki.se</mdui:DomainHint>
         <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
         <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
         <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
@@ -29,7 +30,6 @@
         <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
         <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
         <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
       </mdui:DiscoHints>
@@ -110,8 +110,22 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Malin Westerberg</md:SurName>
+    <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>Eric Johansson</md:SurName>
+    <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Karolinska Institutet</md:Company>
+    <md:SurName>IT-support</md:SurName>
     <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
index ff8c42a7..c73f408e 100644
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aai.pionier.net.pl/IdP/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-22T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se.xml
index 3591e642..0445d7d8 100644
--- a/swamid-interfederations-2.0/login.du.se.xml
+++ b/swamid-interfederations-2.0/login.du.se.xml
@@ -13,13 +13,13 @@
         <mdui:DisplayName xml:lang="en">Dalarna University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Högskolan Dalarna.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for employees and students at Dalarna University.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
         <mdui:Logo height="350" width="146" xml:lang="sv">https://login.du.se/duse-logo-sv.png</mdui:Logo>
         <mdui:Logo height="350" width="146" xml:lang="en">https://login.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
         <mdui:DomainHint>du.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
         <mdui:GeolocationHint>geo:60.6137,15.6536</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
@@ -99,8 +99,22 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
     <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.du.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Dalarna University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778891</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Högskolan Dalarna</Company>
-    <EmailAddress>dempa@du.se</EmailAddress>
+    <Company>Dalarna University</Company>
+    <SurName>IT-avdelningen</SurName>
+    <EmailAddress>shib-admin@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778891</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Dalarna University</Company>
+    <SurName>Högskolan Dalarna Support</SurName>
+    <EmailAddress>support@du.se</EmailAddress>
+    <TelephoneNumber>+46 23 778888</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
index a96b5a1f..add66844 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
@@ -9,13 +9,15 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Örebro Universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Örebro universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Örebro University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
+        <mdui:Description xml:lang="sv">Identity Provider för Örebro universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Örebro University Identity Provider</mdui:Description>
         <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
       </mdui:UIInfo>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DomainHint>oru.se</mdui:DomainHint>
+        <mdui:IPHint>130.243.96.0/19</mdui:IPHint>
         <mdui:GeolocationHint>geo:59.2547,15.2485</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:59.7065,14.5473</mdui:GeolocationHint>
       </mdui:DiscoHints>
@@ -92,14 +94,22 @@ Pz8R3A==</ds:X509Certificate>
     <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen</SurName>
+    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Ehrnberg</SurName>
+    <Company>Örebro University</Company>
+    <SurName>Jonny Ehrnberg</SurName>
     <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303851</TelephoneNumber>
   </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Mikael</GivenName>
-    <SurName>Borjesson</SurName>
-    <EmailAddress>mikael.borjesson@oru.se</EmailAddress>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Örebro University</Company>
+    <SurName>IT Avdelningen Örebro universitet</SurName>
+    <EmailAddress>itsupport@oru.se</EmailAddress>
+    <TelephoneNumber>+46 19 303166</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se.xml b/swamid-interfederations-2.0/shibb1.hj.se.xml
index 0ee7808e..8be14e3f 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se.xml
@@ -97,8 +97,16 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
     <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hj.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Jönköping University</Company>
+    <SurName>Joakim Danielsson</SurName>
+    <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101116</TelephoneNumber>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Högskolan i Jönköping</Company>
+    <Company>Jönköping University</Company>
+    <SurName>Stefan Kindh</SurName>
     <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
+    <TelephoneNumber>+46 36 101170</TelephoneNumber>
   </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
new file mode 100644
index 00000000..fbc58af7
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.mpg.de/mpg/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-10T14:26: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>
+  </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>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">MPG (GWDG MetaDir)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MPG (GWDG MetaDir)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">IdP für MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Description xml:lang="en">Idp for MPG Accounts in GWDG MetaDir</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.mpg.de/favicon.ico</mdui:Logo>
+        <mdui:Logo height="163" width="300">https://shibboleth-idp.mpg.de/mpg/uApprove/logo-mpg.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.mpg.de/kurzportrait</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.mpg.de/183251/portrait</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">http://www.mpg.de/impressum</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.mpg.de/imprint</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHFsFJy21RkjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMzEyMDYx
+MzA4MTJaFw0xODEyMDUxMzA4MTJaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA1r20ptuqe2akE1HNiefNATNZipgA+LMijPqXD2JqxFiO8W5bfQMjQHf0S0v2
+bF9xEGFn7BtuGXR2knfzQoycf5ErOFToUoyf/Pkvqq4dJZzYoIQT/crbnJMm/Sy0
+P/HA8LQMgLV5DjQu7hq79/A7746mqYg0zZm7gCwq+Wbrb5RSBJRlZNFU7c52dDSj
+IjtGjgnD9YA1RbHoqdaguYYSnW4RR8Wh8lAaH8S6n6jsb7MeP7SyfGmw64ZY3vWm
+uDwtfQK1p4wcTOITl1U//Oi5AAqrPA+8T++GooYe9rmIElue/yQdw1ctKWdOVIM/
+zec+pVgLKxcijoqD/14vXgfzLwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFIEaXWTZBwnYrv8u0yR97TeHM3QwMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAG7ohBHYkMb6MSXK2ipMslPTjKF2B7eA
+htIGAVONLIVlz2W50848jj25XpKeCa/rA7l0k+fmMF5UU8LFaswUmRSWmPNDZe2p
+NigWu7hPXU4HlcBxLH6qdyl+nq0KJ+vyKLY2CrA+ULykUjzRYjgcBEa0zehuO4ZC
+X0Md8xW9Qh3eyW3JDkqnBt/yDbJiPPt85gdoZpf6IpQo9gDa4KTQoBSinj/wpu5d
+AM8+OjeD6EllQ2DG9pPflbAvWCvCGjYFefEIOIxj5kVAwNr+hjKmhrvIhcgCRPxC
+lm98qSFLxbEARoZiQPMKYdTVeEcNiiWdrIe7A0QILNiu+LaQCbKHyoM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.mpg.de/mpg/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth-idp.mpg.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth-idp.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIHFsFJy21RkjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xMzEyMDYx
+MzA4MTJaFw0xODEyMDUxMzA4MTJaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECBMN
+TmllZGVyc2FjaHNlbjETMBEGA1UEBxMKR29ldHRpbmdlbjEgMB4GA1UEChMXTWF4
+LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsTA1BLSTEeMBwGA1UEAxMVc2hp
+YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA1r20ptuqe2akE1HNiefNATNZipgA+LMijPqXD2JqxFiO8W5bfQMjQHf0S0v2
+bF9xEGFn7BtuGXR2knfzQoycf5ErOFToUoyf/Pkvqq4dJZzYoIQT/crbnJMm/Sy0
+P/HA8LQMgLV5DjQu7hq79/A7746mqYg0zZm7gCwq+Wbrb5RSBJRlZNFU7c52dDSj
+IjtGjgnD9YA1RbHoqdaguYYSnW4RR8Wh8lAaH8S6n6jsb7MeP7SyfGmw64ZY3vWm
+uDwtfQK1p4wcTOITl1U//Oi5AAqrPA+8T++GooYe9rmIElue/yQdw1ctKWdOVIM/
+zec+pVgLKxcijoqD/14vXgfzLwIDAQABo4ICKTCCAiUwOQYDVR0gBDIwMDARBg8r
+BgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHQYDVR0OBBYEFIEaXWTZBwnYrv8u0yR97TeHM3QwMB8GA1UdIwQYMBaAFALW
+Hm4Jq79YZacKPEgzYdHOfcNbMC4GA1UdEQQnMCWCFXNoaWJib2xldGgtaWRwLm1w
+Zy5kZYEMc2hpYkBnd2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYI
+KwYBBQUHAQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
+ZGUvT0NTUC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNh
+LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAC
+hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
+dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAG7ohBHYkMb6MSXK2ipMslPTjKF2B7eA
+htIGAVONLIVlz2W50848jj25XpKeCa/rA7l0k+fmMF5UU8LFaswUmRSWmPNDZe2p
+NigWu7hPXU4HlcBxLH6qdyl+nq0KJ+vyKLY2CrA+ULykUjzRYjgcBEa0zehuO4ZC
+X0Md8xW9Qh3eyW3JDkqnBt/yDbJiPPt85gdoZpf6IpQo9gDa4KTQoBSinj/wpu5d
+AM8+OjeD6EllQ2DG9pPflbAvWCvCGjYFefEIOIxj5kVAwNr+hjKmhrvIhcgCRPxC
+lm98qSFLxbEARoZiQPMKYdTVeEcNiiWdrIe7A0QILNiu+LaQCbKHyoM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e71</OrganizationName>
+    <OrganizationName xml:lang="en">e71</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.biochem.mpg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.biochem.mpg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniel</GivenName>
+    <SurName>Adler</SurName>
+    <EmailAddress>mailto:daniel.adler@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
new file mode 100644
index 00000000..ba758cfa
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.techlib.cz/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  </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>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+      <shibmd:Scope regexp="false">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for National Library of Technology in Prague.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro Národní technickou knihovnu v Praze.</mdui:Description>
+        <mdui:Logo height="40" width="67">https://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
+X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
+cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
+mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz: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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.techlib.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.cz/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 regexp="false">techlib.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Library of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní technická knihovna</mdui:DisplayName>
+        <mdui:Logo height="40" width="67">http://www.techlib.cz/public/images/logo-eduid.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUX+osnvtxGkyyLqc3Z6xHhgMJP1cwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNobGliLmN6MB4XDTEwMDIxNzEy
+MjYwM1oXDTMwMDIxNzEyMjYwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC50ZWNo
+bGliLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi5FN6efQHuiH
+zERWjziRdD9X4sF76m0v9dest6lxrVXdxBIMjo52h7zkmZnWTwr402rCu6MLr2rX
+Lfz050FcEGSBDQyVr47QsUEQkvsThjdb2LZtjHzxiMc20fngB5+7nrZG4pBwragw
+XxfklvQ9VVdhQ1evD4QLn9Vj0LavZi9BzyOtbO6nPzzw624u0buU/QNeZAs2gNgj
+DJKx2UQW50R/YJUHz7XEd/q8r48+gSWkqh0KPvAbqaQJkZJ2lwyggcqPCV9i9wlF
+aUuE8aDyVKUkmT6Z8HfJKsFUgoGbiUvMMHTKuasiT4UP9hBvVrwgsIjOvSVu9NnL
+uxtP5VnHvQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnRlY2hsaWIu
+Y3qGLGh0dHBzOi8vc2hpYmJvbGV0aC50ZWNobGliLmN6L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBRvpKOl45kZis1SGQnbs2WT6PX2UjANBgkqhkiG9w0BAQUFAAOC
+AQEAbtw87jOn1csGq3iYcEzPXyNO9j+YX1OFhjWhnjhD0z14FYOJKvr2yZ49hJoA
+UoxLanwsquNEE5MyxwlFjE0J9KAg+gTYZ/RQtUWI4qPMOGHzfT02U6HdXtMJVZOO
+CKGd9enAzy87bQ6lSYLMDgwDSvnTy47Xlv3z4a4IPy8+OJrMs5uE2vRs3+iYlDu3
+X/rdSE1Mpx7yDu7Zb/g1xGNOvmIMrZj1rS5rett+ODN9ewGj64Jm0dbfkjoquz7K
+cz9PxjipO+0hvnpmik2TpUCMnPwgLo7RXw0P0huR/qnT5LK6LWpfoNY4ZVEQ3FMu
+mYyU0qeHcluLxU/GrWy+OGqcqQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz: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>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">National Library of Technology</OrganizationName>
+    <OrganizationName xml:lang="cs">Narodni technicka knihovna</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">National Library of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.techlib.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ondrej</GivenName>
+    <SurName>Koch</SurName>
+    <EmailAddress>ondrej.koch@techlib.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se.xml b/swamid-interfederations-2.0/sp-test.swamid.se.xml
index 9df59b98..a563d053 100644
--- a/swamid-interfederations-2.0/sp-test.swamid.se.xml
+++ b/swamid-interfederations-2.0/sp-test.swamid.se.xml
@@ -8,6 +8,7 @@
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index fc86ad57..105ba494 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -22,33 +22,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIEDeB+jDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxNDEx
-MDlaFw0xNDAzMTcxNDExMDlaMHwxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFzAVBgNVBAMTDmNvcnB1czEubXBpLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwvTzVbiFe7HH/LuUoYp
-n27Y2YuxPlXkiLFdMWCvSQVm4jPC1CIZmfJXB/khvySo/Ir/gjoe5gnvMj5co3zJ
-3S6dpgSjaWNZTYtl2cAfzMm5IbMKoAEsG+m3QWE1Zlbc9wT079CJe7YoqYYrHcFX
-Qy9ID7VFt9VQf8tCP86uRF9bxXO4wUvRlzzs65oGDMUS5u/+1bcge/xOrFFfUqVU
-Ebjtoh8L/cVtc4bEME5lVXxF26qrLCWSEDl8c+ULyrHMngRu/+utSSBQUJyqmEMd
-RLngB5GkB3Dvczd2d/NZy2XiqfjLFDA9Ok2HuJtSlYofeH/BwPM4dMgXB/lo16lY
-dwIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHxqV98GFaGyiUNK+C8zDnIYm5FxMB8GA1Ud
-IwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGGL2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWg
-M6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCvd62K/i554VZfOW9HtmKPKNdT
-Fe56uOS8p57Gg+HY+CUYMbmoL+rZqaYl+Uli8X5R5Pi4JU8Z88ttKSQ/+XISPP5/
-OE3022obFJ0ZUct2AWYgckmie10Kd5vXOxfw0Mn/cdZqCJAO64tzwk5el120LA1w
-rwtNxwRiR5VinZDirrm78RNC8wlr9iKFkVl3whTW6sdtE7AlZ0r9XaaigKS2wjNd
-4QC9LVo0aBpxR3ryo7+I31uKXQpNwLJSZXnD9pII4iKjmVDc1ndiu6rhO2TKF6lq
-yZtIZ9oG/5n1qef1ClZ+7d3uAl7ssvsV67Uj4JcTlR0UfYykUlPONDdsYqiu
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <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>
@@ -57,33 +62,38 @@ yZtIZ9oG/5n1qef1ClZ+7d3uAl7ssvsV67Uj4JcTlR0UfYykUlPONDdsYqiu
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIEDeB+jDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxNDEx
-MDlaFw0xNDAzMTcxNDExMDlaMHwxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFzAVBgNVBAMTDmNvcnB1czEubXBpLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwvTzVbiFe7HH/LuUoYp
-n27Y2YuxPlXkiLFdMWCvSQVm4jPC1CIZmfJXB/khvySo/Ir/gjoe5gnvMj5co3zJ
-3S6dpgSjaWNZTYtl2cAfzMm5IbMKoAEsG+m3QWE1Zlbc9wT079CJe7YoqYYrHcFX
-Qy9ID7VFt9VQf8tCP86uRF9bxXO4wUvRlzzs65oGDMUS5u/+1bcge/xOrFFfUqVU
-Ebjtoh8L/cVtc4bEME5lVXxF26qrLCWSEDl8c+ULyrHMngRu/+utSSBQUJyqmEMd
-RLngB5GkB3Dvczd2d/NZy2XiqfjLFDA9Ok2HuJtSlYofeH/BwPM4dMgXB/lo16lY
-dwIDAQABo4IBfzCCAXswCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHxqV98GFaGyiUNK+C8zDnIYm5FxMB8GA1Ud
-IwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMHcGA1UdHwRwMG4wNaAzoDGGL2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWg
-M6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
-BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCvd62K/i554VZfOW9HtmKPKNdT
-Fe56uOS8p57Gg+HY+CUYMbmoL+rZqaYl+Uli8X5R5Pi4JU8Z88ttKSQ/+XISPP5/
-OE3022obFJ0ZUct2AWYgckmie10Kd5vXOxfw0Mn/cdZqCJAO64tzwk5el120LA1w
-rwtNxwRiR5VinZDirrm78RNC8wlr9iKFkVl3whTW6sdtE7AlZ0r9XaaigKS2wjNd
-4QC9LVo0aBpxR3ryo7+I31uKXQpNwLJSZXnD9pII4iKjmVDc1ndiu6rhO2TKF6lq
-yZtIZ9oG/5n1qef1ClZ+7d3uAl7ssvsV67Uj4JcTlR0UfYykUlPONDdsYqiu
+          <ds:X509SubjectName>CN=corpus1.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <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>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 7f9a49b4..9451fd3f 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -29,33 +29,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>lux17.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
-MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
-bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
-h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
-CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
-Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
-inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
-AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
-GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
-MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
-cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
-MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
-LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
-3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
-A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
-7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
+LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
+sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
+6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
+vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
+L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
+o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
+rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
+GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
+EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
+KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
+UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
+YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
+9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
+scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
+2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
+IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,33 +69,38 @@ A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>lux17.mpi.nl</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
-MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
-bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
-h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
-CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
-Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
-inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
-AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
-GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
-MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
-cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
-MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
-LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
-3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
-A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
-7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==
+          <ds:X509SubjectName>CN=lux17.mpi.nl,OU=Max-Planck-Institut fuer Psycholinguistik,O=Max-Planck-Gesellschaft,L=Nijmegen,ST=Gelderland,C=NL</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
+Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
+MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
+R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
+Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
+ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
+LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
+sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
+6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
+vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
+L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
+o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
+rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
+GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
+EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
+MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
+L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
+L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
+KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
+UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
+BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
+YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
+9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
+scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
+2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
+IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -128,9 +138,9 @@ A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
     <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>van Valkenhoef</SurName>
-    <EmailAddress>mailto:Tobias.vanValkenhoef@mpi.nl</EmailAddress>
+    <GivenName>Lat</GivenName>
+    <SurName>Admin</SurName>
+    <EmailAddress>mailto:latadmin@mpi.nl</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="administrative">
     <GivenName>Dieter</GivenName>
diff --git a/swamid-interfederations-2.0/sp.swamid.se.xml b/swamid-interfederations-2.0/sp.swamid.se.xml
index 04deb4d5..19654dcb 100644
--- a/swamid-interfederations-2.0/sp.swamid.se.xml
+++ b/swamid-interfederations-2.0/sp.swamid.se.xml
@@ -8,6 +8,7 @@
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
index a18527b0..55cf472a 100644
--- a/swamid-interfederations-2.0/sso.man.poznan.pl.xml
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/pozman/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-13T14:05:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-03-22T14:05:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl.xml b/swamid-interfederations-2.0/sso.nikhef.nl.xml
new file mode 100644
index 00000000..5f39b7db
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.nikhef.nl.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.nikhef.nl/sso/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-11-18T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <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="nl">Nikhef</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Nikhef</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Nikhef</mdui:Description>
+        <mdui:Description xml:lang="en">Nikhef</mdui:Description>
+        <mdui:Logo height="48" width="108">https://static.surfconext.nl/media/idp/nikhef.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
+BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
+VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
+FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
+MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
+B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
+bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
+AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
+u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
+EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
+D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
+B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
+A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
+6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
+2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
+mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
+8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
+fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
+FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
+3P2Tx32Cq1WXCYkxLaPI
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">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://engine.surfconext.nl/authentication/idp/single-sign-on/9b3c7c0e251cbaa2fe441bf93e1e07bc"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nikhef</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nikhef.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
new file mode 100644
index 00000000..5a5f64dd
--- /dev/null
+++ b/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testssso.uni-muenster.de/shibboleth-sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-03-13T10:36:34Z">
+      <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>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <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://testssso.uni-muenster.de/-shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
+        <mdui:Description xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF+DCCBOCgAwIBAgIHFCidFzwGDzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEyMDcyMDA5
+MDYxNloXDTE3MDcxOTA5MDYxNlowgbExCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
+bnN0ZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCYK4Y7STE
+L8OlunXF0IQl7BqeJQVZ88sfR3yHWqwihuhh5Xy+xqBHpVg07VbOMr9E+cx0zgOO
+wqMkTIA6+B7RfI5EGiIaiUI3TUew1oibfFqwQ7GC34rawnVzYmOiOHoKdBqD8KTN
+hR5zdDK64OdhrmUCCQ9ViSelXoBK9oo7ko3IqmEJrSWc8EqN5/k4/LEQuieJJEok
+YHuIAKTWy5tyglVcN0mlpR+kZOeKf96IO14z71GmMbUSNHepidzSyoTL5Na9uG0u
+dchHkrDRkdJtr9Ou23P75bJLuRJ+K8wo1sT63lCinEhupK91z3vHg0DsA8v6uBit
+UyGfTxnz4izLAgMBAAGjggI2MIICMjAvBgNVHSAEKDAmMBEGDysGAQQBga0hgiwB
+AQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRYwYC2Uz5H
+6Ynz6B811VlykXutszAfBgNVHSMEGDAWgBS+nlGiyZJ8u2CL5rBoZHdaUhmhADA9
+BgNVHREENjA0ghh0ZXN0c3Nzby51bmktbXVlbnN0ZXIuZGWBGHd3d2FkbWluQHVu
+aS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACQHZ+2pf6Lyk2q7Teu2nPxG1uAz
+KmEKY2GkQmDpySrcVn5Gex4b2EtmgcmEOXgzHtYHOlJYcSjHVLZt+41eTsh5si8D
+ozAv2qIJV/RjRg9btBCHYJRsxoP5rRuZZ/ASfCb+stJWgx+1gu0PodosZgFKiM2E
+3zWjeMkqDxP9uS1NLyB+/V8N67cdOYdP/dKx9dIw+rCeAsr0OlFaEX3q/LzA2NWU
+O7HVimoyfRBz43eqdPCoyZ89aMPYdktSICu/kaOXHtAp1j4BrDwr3fnbE+lPpU/1
+EecubiQE8/Mek9uGrP8kBfIyCBKwvjxuXqgCIBhis6wo9C1/uM1c4uiqg7M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Universität Münster (Staging)</ServiceName>
+      <ServiceName xml:lang="en">Universität Münster (Staging)</ServiceName>
+      <ServiceDescription xml:lang="de">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</ServiceDescription>
+      <ServiceDescription xml:lang="en">Dies ist ein weiterer, nur zeitweise aktiver Zugang zum Single Sign-On der Universität Münster (siehe dort).</ServiceDescription>
+      <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"/>
+      <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"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Rainer</GivenName>
+    <SurName>Perske</SurName>
+    <EmailAddress>mailto:wwwadmin@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch.xml b/swamid-interfederations-2.0/umbrella.psi.ch.xml
index a7a58f97..b6fc3c63 100644
--- a/swamid-interfederations-2.0/umbrella.psi.ch.xml
+++ b/swamid-interfederations-2.0/umbrella.psi.ch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://umbrella.psi.ch/">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-04T10:12:47Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-03-18T09:41:16Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -40,11 +40,12 @@ jXaHZDgEhAR+tFkQFgpQhGcJTs1bLugCxSjdrA==
     </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML2/POST/SSO" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML2/Artifact/SSO" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/SOAP/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML/POST/SSO" index="4" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML/Artifact/SSO" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
       <ServiceName xml:lang="en">Umbrella Test Service Provider</ServiceName>
       <ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</ServiceDescription>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net.xml b/swamid-interfederations-2.0/webinar.nordu.net.xml
index 6a26a667..46d23a2e 100644
--- a/swamid-interfederations-2.0/webinar.nordu.net.xml
+++ b/swamid-interfederations-2.0/webinar.nordu.net.xml
@@ -7,6 +7,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="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">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-interfederations-2.0/weblogin.dante.net.xml b/swamid-interfederations-2.0/weblogin.dante.net.xml
index fb049d55..f28c47a0 100644
--- a/swamid-interfederations-2.0/weblogin.dante.net.xml
+++ b/swamid-interfederations-2.0/weblogin.dante.net.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin.dante.net/adfs/services/trust">
-  <!--
-		This is a "DANTE" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
-	-->
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-23T14:41:31Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se.xml
index 494acfcc..4093da33 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se.xml
@@ -4,6 +4,11 @@
     <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>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="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">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -15,7 +20,9 @@
         <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="125" width="125">https://weblogin.uu.se/uu_img/uulogo_lightgrey.gif</mdui:Logo>
+        <mdui:Logo height="102" width="102">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo>
+        <mdui:Logo height="102" width="102" xml:lang="sv">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo>
+        <mdui:Logo height="102" width="102" xml:lang="en">https://weblogin.uu.se/idp/UUlogin/img/UU_logga_transp.png</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -109,9 +116,20 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
   </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>Uppsala University</Company>
+    <SurName>SAML2 admins</SurName>
+    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+  </ContactPerson>
   <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <SurName>AKKA SAML2</SurName>
+    <Company>Uppsala University</Company>
+    <SurName>SAML2 admins</SurName>
     <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
   </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+    <Company>Uppsala University</Company>
+    <SurName>Helpdesk</SurName>
+    <EmailAddress>helpdesk@uu.se</EmailAddress>
+    <TelephoneNumber>+46184717890</TelephoneNumber>
+  </ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net.xml
new file mode 100644
index 00000000..a6a6e06d
--- /dev/null
+++ b/swamid-interfederations-2.0/weblogin2.geant.net.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://weblogin2.geant.net/adfs/services/trust">
+  <!--
+		This is a "GÉANT Intranet" ADFS SP for Delivery of Advanced Network Technology to Europe Limited.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T15:23:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT Intranet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Provides access to GÉANT project documents, meetings and important information.</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQQSSnV5Mk/EXZxgrsbnU7ajANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						qzeOIPfgr/SneQUtjqDRGLbG4YKxmo2zfAIF+wjaYXnDTq/yWt852nImchvCgjWu
+						eXnHJ6oZZGdaN4kMgPh1oxqJ4UE6dXY9HEoru/Awp2P/CGiYOQ4Q5u5+AyFznGRx
+						y2uNYrD85C6uTIgiKytH6Lai8f6dFxHKO/u8o+kbrl2Z1CkAf6wePu2H5a44tGnF
+						SP/s7lW4ScSthNz1OF8BoPFKpWUmJk/584rZZjR+fqB9fQBwxRoRBCFZTduXP0G9
+						861BS6Nt6Dfuli9jdCBC0L8ai4fH43a94EQVmMfcjImrkYBg7v6lVS4IY75ONiOt
+						sObamvbT+yNEuqw0jBjmKwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBQXWZZ8RdkPMtC2o0RF+T+gH7VsMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczIuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCRJqxXjeInIqlPLH5+
+						iFqL92oLPKiJDqlDWpzR9P0xF7IS4oBApWZ3f2Rgcx1dtwUf7TakMpAuxIxzMjfP
+						xaik/AuInMjxKU9AJS/lRlLogT3YXZ2aAGZbt2P/hYn4mdn5ryB9WF/w7mnyrpBb
+						o7vllsYXYmRX/c0MEPYfSMoKxomRAY2ViIh83m4sYk8+Nkm+3I9t0O3wBqaQYqpc
+						Mg48AG2JwLeuKUIC+faPOckeMXdrknL0Ra7Vb+eRoEKCqw3L9ka5/rloFNEN+hMZ
+						zubyfY3feeIV+kq3YNmjCwhDqckv5kXAdnkFprjB3X/xNfML2Jum02hKkff4AYfP
+						2IOi
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIEfzCCA2egAwIBAgIQF6zX9vs9vNm8j+JNDERNrzANBgkqhkiG9w0BAQUFADA2
+						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+						U1NMIENBMB4XDTEzMDMwNjAwMDAwMFoXDTE2MDMwNTIzNTk1OVowRzEhMB8GA1UE
+						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+						uKfTJW51WQmvVJxulyh0wNtFIPPLzggtQIeUOvPGiTXexjTrr53MJq45xCa/7mCM
+						pfmtoH8ab1BjXRUzdiz4/YuXdCrkOL/tr9Mb4S/DndLdLfeOrvD3ybgq8Xar1YYL
+						7Xzi1N3eHVoAvl/CQv4VWtw2Vi64uRox8BaF1UtHnwTeAvAhGzn/q7kaaaKSfJJa
+						9dyfyuOyeST6mrxFz9vb4EQ5Lun4XDJCcP85RiiPBF1pkVgyVNtKfN1EMiuEzlUY
+						mUXVGnw7b/oHrvKTYD6XXXMCg9i9hc0ISS2Xwc4bMT5jtVoS1MSpV4rCBDmf5q75
+						QVS/sRGhlGS6XWsiUFElJQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
+						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFIeBraKafW8VLXEb6g6HwVi6+8nVMA4G
+						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
+						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
+						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlzcDIwMTMtaGEt
+						YWRmczEuZ2VhbnQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQBzqXX72xflZ+TDvjBO
+						Zb8xzcHD2ejDznK3SfK15AvXFenR6BhLnAJO2bllnqh3BpB3IzVm7Qc3Sxt2SK/5
+						li8bnLC5Qw6jtHHZtrIJiU5OQNQaln2rwR4rxE9NZs+RR7KjBUwLMhFvm+Akqr8g
+						oYOqvI8nIiC5IVzKss30nqQRnyl8nJK2sV/pQ78E9kF397uINVme1uFCMzXnAO9S
+						Ry3GIMFd4ky6VaECWVQANXusa3cklaFk4Bl8HwihDqqZCBvu8u6LZCbnlwX4ruLH
+						2+TAfutGBPunq7oftkXZ1qWqt5LQF7kReueHyd+Dplaxj3s6Kk/7HhfUXRC8mfNB
+						BDy6
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin2.geant.net/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin2.geant.net/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin2.geant.net/adfs/ls/" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT Intranet</ServiceName>
+      <ServiceDescription xml:lang="en">Provides access to GÉANT project documents, meetings and important information.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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="false"/>
+      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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"/>
+      <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"/>
+      <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"/>
+      <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"/>
+      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>DANTE IT Support</GivenName>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>DANTE IT</GivenName>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz.xml b/swamid-interfederations-2.0/www.vutbr.cz.xml
new file mode 100644
index 00000000..a7f61740
--- /dev/null
+++ b/swamid-interfederations-2.0/www.vutbr.cz.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vutbr.cz/SSO/saml2/idp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+      <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>
+  </Extensions>
+  <IDPSSODescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">vutbr.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Brno University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Vysoké učení technické v Brně</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Brno University of Technology</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysokého učení technického v Brně</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.vutbr.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.vutbr.cz/</mdui:InformationURL>
+        <mdui:Logo height="84" width="180">https://www2.eduid.cz/idp-loga/vut.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDyDCCArCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcMBEJybm8xDDAKBgNVBAoMA0JVVDENMAsGA1UECwwEQ1ZJUzEVMBMGA1UEAwwMQ1ZJUyBVTklYIENBMB4XDTEyMDgyOTExNTEwNFoXDTIyMDgyNzExNTEwNFowaTELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMQ0wCwYDVQQHDARCcm5vMQwwCgYDVQQKDANCVVQxDTALBgNVBAsMBENWSVMxFTATBgNVBAMMDHd3dy52dXRici5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALXWlW/8fKDvTZuYpa3NjOxoreomNt7rb4BBLnyflF4pnrqkO7JkJfzxGPDN1ntMhSG0ubKv8bAq60MLfxwR0ia8KfWU17cVShpQ+/qZBtq3ha+78lsrmRb4K0bFvbnXKBxDTLJ0A9a6644O9DxpWNufnRJWukS45w6+nuwgCz6t3YrfF5FJFyf3z+RxfjZeqPMsxwzVarDmLJ3yMksSZKi9GQYxy3IWs12omM3E5ESIvJp9sYf4chwZJHhnLzGI/wxV2p/TD8HVB72sfAN4hourY4Yyy2Y93r8M6oQ8FpxfVlOnhkE9Y+oHl/eyQcM8rQM2uHKX8YZ8osvypqvoTnUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCZONDpcM7CZ5UWgMgbSKafxnIkJMB8GA1UdIwQYMBaAFAawVMF2h+OuCnZ4RBYk6iGjuvJzMA0GCSqGSIb3DQEBBQUAA4IBAQDf8AxfrehzO9Wx9JFHrhacaz+ON0YpuamXK5Q7sprba7J5tAP3xbBsKpLh9vR1M0UqSYf4rL90ge/fQawJK7Erq3r+O9P192jPfWJeU733K+AyOo9e7ZE4XRDub44L4YrG4+1igQXTAs5GyZFgAtN4c+1bEoAsOU+kChyZ931OsfmnXNnCtP3Zrp2bvAtR28uDJ3y8z7qNgK0SBTuFjBORIXq8eycTkxAjnSrLUiTMEZO+kJIUQkjr0jIAFh9lkD3qFhJ+ariWJwPt156p41twmu4xNCj94EDl9JKzFdnk2TUl5P+5y8aXwJ7WDJUqXswWrTZtdS2E1qIHxcTLnDES</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/BUTSingleLogoutService.php" ResponseLocation="https://www.vutbr.cz/SSO/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Brno University of Technology</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Brno University of Technology</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.vutbr.cz/en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.vutbr.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Webmasters</GivenName>
+    <SurName>VUT Portal</SurName>
+    <EmailAddress>portal@vutbr.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
index d8a6281b..1639bd4d 100644
--- a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
@@ -14,6 +14,7 @@
         <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
         <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
         <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>